On Sat, Nov 12, 2011 at 11:14 PM, tombert <tomb...@live.at> wrote:
> Interesting - but I found this explanation in the manual:
> --merge When switching branches, if you have local modifications to
> one or more files that are different between the current branch and
> the branch to which you are switching, the command refuses to switch
> branches in order to preserve your modifications in context.
> (see http://schacon.github.com/git/git-checkout.html)
> So in my opinion it should have refused to switch branches!?
It will only refuse to switch branches if <file> that has local
changes _also_ has changes between <current branch> and <new branch>.
Otherwise it is safe to preserve your local changes when checking out
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at