Details
-
Bug
-
Resolution: Unresolved
-
Low
-
None
-
1.8.0.3
-
None
-
Mac
-
Severity 3 - Minor
Description
I'm switching from submodules to subtrees. To do this, I've created a topic branch and done the work in there. To get everything working properly, I had to delete the submodule folders entirely from disk. Once I have the subtrees set up in my branch, I can't checkout to move back and forth between my topic branch and the master branch because once I have the submodule re-established, they end up leaving their files as untracked files when trying to switch back to my subtree branch and I have to go and clean them up off of disk again.
It seems like in GITs view, it starts with no untracked/modified files, so it is fine with the checkout to the new branch with subtrees in place of submodules, but once it switches its view to that with subtrees, then all the submodule-related stuff appears as untracked files that would get overwritten. So, considered strictly from the end-user's perspective, I see that my working tree is clean, so I expect to be able to switch from this to any arbitrary branch.