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

Re: how to automatically open conflicted files when "git rebase" encounter conflict

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 18, 2022, 18:24 UTC
Message-ID
<xmqqpmmj9l11.fsf@gitster.g>
In-Reply-To
<CA+JQ7M8_QiidajaWJpz3gFeUXiLMLiDA38W1mnWyxnMLJN3fpQ@mail.gmail.com>
Erik Cervin Edin <erik@cervined.in> writes:
Show 5 quoted lines
> In the situations of more complicated conflicts (as well as the
> functionality you request) can be invoked using
>   git mergetool
>   git mergetool -- 'pathspec'
>   git mergetool --tool=vimdiff -- 'pathspec'

Yeah, I forgot all about "git mergetool". I think that is the official answer to the original question.

Previous: Erik Cervin EdinNext: brian m. carlson
Message 6 of 8 in “how to automatically open conflicted files when "git rebase" encounter conflict”
  1. wuzhouhuiMar 18, 2022
  2. Junio C HamanoMar 18, 2022
  3. Erik Cervin EdinMar 18, 2022
  4. wuzhouhuiMar 19, 2022
  5. Erik Cervin EdinMar 18, 2022
  6. Junio C HamanoMar 18, 2022
  7. brian m. carlsonMar 18, 2022
  8. Junio C HamanoMar 18, 2022

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.