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, 18:39 UTC
Message-ID
<20081109183917.GA18415@euler>
In-Reply-To
<81bfc67a0811090709s483506c1h6f9cb0f96216ef22@mail.gmail.com>
On Sun, Nov 09, 2008 at 10:09:49AM -0500, Caleb Cushing wrote:
> is there any way to force a merge conflict?

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.

Show 5 quoted lines
> in this case I have a dev branch and fork branch the fork is a copy of
> dev except I committed one of the files from the fork. I need to merge
> this file back into dev, but git thinks it's a fast forward, because
> it really is for git, in reality it isn't, both files have newer
> history than their common ancestry.
git merge --no-ff ?

Hope that helps, Deskin Miller

Previous: Caleb CushingNext: Caleb Cushing
Message 2 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.