git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merge seems to overwrite unstaged local changes

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Sep 29, 2011, 13:07 UTC
Message-ID
<CAHGBnuNrhtyq1tfok3p9YHAVbfo9T7BO3ZOUy+8YvNE9Mmhjhg@mail.gmail.com>
In-Reply-To
<7vaa9o1yf7.fsf@alter.siamese.dyndns.org>
On Wed, Sep 28, 2011 at 17:25, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
>> ... 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
Previous: Junio C HamanoNext: Sebastian Schuberth
Message 3 of 6 in “Merge seems to overwrite unstaged local changes”
  1. Sebastian SchuberthSep 28, 2011
  2. Junio C HamanoSep 28, 2011
  3. Sebastian SchuberthSep 29, 2011
  4. Sebastian SchuberthOct 6, 2011
  5. Jakub NarebskiOct 6, 2011
  6. Another casualtyChris Hatton, Jan 10, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.