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, 04:11 UTC
Message-ID
<xmqqtubvc32q.fsf@gitster.g>
In-Reply-To
<bc7b04de-17be-df86-1c93-792903eeec9b@mails.ucas.ac.cn>
wuzhouhui <wuzhouhui14@mails.ucas.ac.cn> writes:
Show 9 quoted lines
> Hi
>
> When "git rebase" stopped due to conflict, I have to manually open
> conflicted
> file one by one and resolve conflict, and the typing file path is too
> boring.
> So, how to automatically open (e.g. use Vim) conflicted files?
>
> Thanks.
Perhaps take "git jump" from contrib/ and do
    $ GIT_EDITOR=vi git jump merge
Previous: wuzhouhuiNext: Erik Cervin Edin
Message 2 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.