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

Re: force a merge conflict

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Nov 11, 2008, 17:24 UTC
Message-ID
<81bfc67a0811110924y5ff6a669kee5cb33c92c6046d@mail.gmail.com>
In-Reply-To
<85647ef50811110914w7e1d36afh23b43b44ba0e2cf3@mail.gmail.com>
Show 6 quoted lines
> Is not the following option of the merge just for it?
>
>  --no-commit
>     Perform the merge but pretend the merge failed and do not
>  autocommit, to give the user a chance to inspect and further tweak the
>  merge result before committing.

yes and no... it doesn't auto-magically allow me to do what a merge conflict does. which is put together a diff. all it really did was not commit the auto merge.

as far as --no-ff I'm not saying it commits the same way but I didn't see any difference in the resulting diffs, which, imho, all that matters is whether the resulting merged code is correct.

-- 
Caleb Cushing
Previous: Caleb Cushing
Message 7 of 7 in “force a merge conflict”
  1. Caleb CushingNov 9, 2008
  2. Deskin MillerNov 9, 2008
  3. Caleb CushingNov 9, 2008
  4. Deskin MillerNov 9, 2008
  5. Brett SimmersNov 10, 2008
  6. Caleb CushingNov 11, 2008
  7. Caleb CushingNov 11, 2008

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.