Re: Merge seems to overwrite unstaged local changes

On Wed, Sep 28, 2011 at 17:25, Junio C Hamano [off-list ref] wrote:

quoted

... I'm seeing this on Linux and Windows, with versions 1.7.4.3 and 1.7.6.

There recently have been quite a change in merge-recursive implementation
and it would be really nice if you can try this again with the tip of
'master' before 1.7.7 final ships.

The unstaged changes do not seem to get lost during the merge anymore
when using git version 1.7.7.rc3.4.g8d714 on Linux. I guess that
somewhat confirms that there's a bug in git < 1.7.7. I'll write a word
of warning to our in-house git users that they should always commit
before merging ...

-- 
Sebastian Schuberth