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:10 UTC
Message-ID
<81bfc67a0811110910ic7f3fa7u77676961b0eac118@mail.gmail.com>
In-Reply-To
<e32b7bb40811101111o8c4334dj49a0c56c6dac6d15@mail.gmail.com>
> If you want to be given a chance to edit the result before the merge
>  commit, you probably want 'git merge --no-commit'.

That's the closest to what I need to do... unfortunately it's not what I need to do. Apparently I'll have to do a vimdiff outside of git since git doesn't appear to be capable of doing what I need it to do.

-- 
Caleb Cushing
Previous: Brett SimmersNext: Caleb Cushing
Message 6 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.