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

Re: Edit a rerere conflict resolution

From
Vincent van Ravesteijn <vfr@lyx.org>
Date
Mar 16, 2012, 16:37 UTC
Message-ID
<4F636C5F.1060509@lyx.org>
In-Reply-To
<7vvcm4h61a.fsf@alter.siamese.dyndns.org>
Op 16-3-2012 17:20, Junio C Hamano schreef:
Show 9 quoted lines
> Vincent van Ravesteijn<vfr@lyx.org>  writes:
>
>> No, I turned rerere.autoupdate off. Proven in the above by the line
>> "Resolved... " instead of "Staged...".
> Yeah, actually I just tried and the procedure works with or without
> autoupdate for me.
>
> So there is something different between our setup (or the nature of the
> conflict), but I do not know what it is offhand.

Hmm.. The behaviour seems to be different for the "official Git for Windows 1.7.9" as for the version I compiled myself with MSVC.

First, the sha1s in the rerere cache differ. Second, when using the MSVC version to generate the preimages and resolutions, I can use both version to forget the resolution again.

Maybe another EOL-style problem ?
Vincent
Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 16 in “Edit a rerere conflict resolution”
  1. Vincent van RavesteijnMar 12, 2012
  2. Junio C HamanoMar 12, 2012
  3. Vincent van RavesteijnMar 12, 2012
  4. Junio C HamanoMar 12, 2012
  5. Vincent van RavesteijnMar 12, 2012
  6. Junio C HamanoMar 12, 2012
  7. Vincent van RavesteijnMar 12, 2012
  8. Jakub NarebskiMar 12, 2012
  9. Junio C HamanoMar 12, 2012
  10. Vincent van RavesteijnMar 16, 2012
  11. Junio C HamanoMar 16, 2012
  12. Vincent van RavesteijnMar 16, 2012
  13. Junio C HamanoMar 16, 2012
  14. Vincent van RavesteijnMar 16, 2012
  15. Junio C HamanoMar 16, 2012
  16. Vincent van RavesteijnMar 17, 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.