From: wuzhouhui <wuzhouhui14@mails.ucas.ac.cn>
Date: Sat, 19 Mar 2022 02:01:46 GMT
Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Message-ID: <550558de-7847-ee2e-171b-1e03f2daf570@mails.ucas.ac.cn>
In-Reply-To: <xmqqtubvc32q.fsf@gitster.g>

On 3/18/22 12:11, Junio C Hamano wrote:
> 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
Thanks everyone, The "git jump merge" satisfies my needs.