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

Re: How to selectively recreate merge state?

From
Paolo Bonzini <bonzini@gnu.org>
Date
Dec 11, 2009, 20:38 UTC
Message-ID
<hfuakf$fnd$1@ger.gmane.org>
In-Reply-To
<200912111220.40844.jnareb@gmail.com>
On 12/11/2009 12:20 PM, Jakub Narebski wrote:
>> >  2 and 3 are easy (cheap) to recreate from HEAD and MERGE_HEAD, 1 is not.
>> >  I guess that's why --unresolve doesn't even attempt to do anything with 1.
> But then "git update-index --unresolve<file>" is next to useless.

Only "next to". It can still be useful if you added a file before editing it, so you left in the conflict markers.

Paolo
Previous: Junio C HamanoNext: Junio C Hamano
Message 17 of 18 in “How to selectively recreate merge state?”
  1. Jay SoffianDec 10, 2009
  2. Junio C HamanoDec 11, 2009
  3. Jakub NarebskiDec 11, 2009
  4. Junio C HamanoDec 11, 2009
  5. Jakub NarebskiDec 11, 2009
  6. Michael J GruberDec 11, 2009
  7. Björn SteinbrinkDec 11, 2009
  8. Thomas RastDec 11, 2009
  9. Jakub NarebskiDec 11, 2009
  10. Michael J GruberDec 11, 2009
  11. Jakub NarebskiDec 11, 2009
  12. Michael J GruberDec 11, 2009
  13. Junio C HamanoDec 11, 2009
  14. Junio C HamanoDec 11, 2009
  15. Jay SoffianDec 11, 2009
  16. Junio C HamanoDec 11, 2009
  17. Paolo BonziniDec 11, 2009
  18. Junio C HamanoDec 11, 2009

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.