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

Re: Bad merging with stgit or git

From
Junio C Hamano <junkio@cox.net>
Date
Mar 21, 2006, 23:02 UTC
Message-ID
<7vfylbcsg4.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<1142972313.4749.123.camel@praia>
Mauro Carvalho Chehab <mchehab@infradead.org> writes:
Show 12 quoted lines
>From what I'm understanding now, I should do, when a conflict is
> detected:
>
> nano <files>
> git-update-index <files>
> git commit
>
> Previously (at git 1.1.4), I was doing:
> nano <files>
> git commit <files>
>
> git 1.2.4 don't allow this bad commit syntax anymore.

It is not a bad syntax, and it instead would say "you might have meant to say -i paths...", and if you follow that suggestion to say:

	$ git commit -i this-and-that-file-I-resolved-by-hand

you would commit the cleanly auto-resolved paths _and_ the result of your hand merge result. That is the same traditional behaviour you are used to and is very convenient if you only had a few paths to be hand resolved.

So I suspect there might be something else going on.
Previous: Mauro Carvalho ChehabNext: Linus Torvalds
Message 4 of 8 in “Bad merging with stgit or git”
  1. Mauro Carvalho ChehabMar 21, 2006
  2. J. Bruce FieldsMar 21, 2006
  3. Mauro Carvalho ChehabMar 21, 2006
  4. Junio C HamanoMar 21, 2006
  5. Linus TorvaldsMar 21, 2006
  6. Petr BaudisMar 21, 2006
  7. Linus TorvaldsMar 21, 2006
  8. Junio C HamanoMar 21, 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.