From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Mar 2022 04:11:25 GMT
Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
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:

> 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