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

manual merge/fixup question

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Jan 7, 2006, 16:55 UTC
Message-ID
<20060107165506.67640.qmail@web31812.mail.mud.yahoo.com>

git resolve or git merge fails, complaining about file(s) having conflicts. I go ahead and fix up those files and then update the index.

Can I assume now that I can go ahead and do git commit, or is there any more/other files which need fixing?

I.e. does git resolve/merge fail on the first file which needs fixing or would it go through all of them, and then report the ones which need fixing?

Thanks,
   Luben
Next: Luben Tuikov
Message 1 of 2 in “manual merge/fixup question”
  1. Luben TuikovJan 7, 2006
  2. Luben TuikovJan 7, 2006

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.