Re: how to automatically open conflicted files when "git rebase" encounter conflict
On 3/18/22 12:11, Junio C Hamano wrote:
Show 14 quoted lines
> 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.