Hi All,
On Mac OS X with a case-insensitive file system (not sure if that matters) git get's confused with branch names that differ only in case. Here is what happened as far as I can reconstruct:
While in a branch named "foundry" I accidentally
git checkout Crucible
instead of "crucible". This appears to have made a local branch "Crucible" of the remote tracking "crucible" branch (had I done this on purpose, I would have expected "Crucible" to be a branch of "foundry" instead of a branch of "crucible").
I made some changes, committed, and pushed, only to be puzzled that no changes were pushed upstream.
At this point "git branch -a" showed:
* Crucible
foundry
master
remotes/origin/DAExceptions
remotes/origin/HEAD -> origin/master
remotes/origin/centerSectionOptimizer
remotes/origin/crucible
remotes/origin/foundry
remotes/origin/ipad
remotes/origin/master
So naturally I proceeded with
git checkout crucible
git merge Crucible
only to see "Already up-to-date."
Not sure if any of this is expected behavior, but to me it didn't feel like it.
Thanks
Gerd
PS: here is how I "fixed" this:
git checkout Crucible
git reset --soft HEAD^
git stash
git stash apply
added, committed, pushed. BTW now "git branch -a" shows:
* crucible
foundry
master
remotes/origin/DAExceptions
remotes/origin/HEAD -> origin/master
remotes/origin/centerSectionOptimizer
remotes/origin/crucible
remotes/origin/foundry
remotes/origin/ipad
remotes/origin/master
No trace of the "Crucible" branch.