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

Re: force a merge conflict

From
Deskin Miller <deskinm@umich.edu>
Date
Nov 9, 2008, 20:35 UTC
Message-ID
<20081109203526.GB18415@euler>
In-Reply-To
<81bfc67a0811091219t393ab1faj8d1c4df6de3c260c@mail.gmail.com>
On Sun, Nov 09, 2008 at 03:19:57PM -0500, Caleb Cushing wrote:
Show 10 quoted lines
> > I'm not sure a 'conflict' is what you want, based on what you say below;
> >  rather, it seems you simply want to force a 'merge commit', i.e. a commit with
> >  multiple parents.
> 
> >
> > git merge --no-ff ?
> >
> I tried that but I don't see that it's any different than a fast
> forward in this scenario. Actually I don't see any difference between
> it and a fast-forward.

Look at the results of 'git merge' and 'git merge --no-ff' in gitk. Or, compare the resultant sha1 for the two commit objects. Or, look at 'git log' of the resulting commit objects, and look for a 'Merge:' line.

Deskin Miller
Previous: Caleb CushingNext: Brett Simmers
Message 4 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.