Re: [git-users] Re: Why does this happen (unexpected git behaviour)

2011-11-12 Thread PJ Weisberg
On Sat, Nov 12, 2011 at 9:14 PM, tombert 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 comma

Re: [git-users] Re: Why does this happen (unexpected git behaviour)

2011-11-12 Thread Jack Nagel
On Sat, Nov 12, 2011 at 11:14 PM, tombert 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 comm