On 3/18/22 12:11, Junio C Hamano wrote:
wuzhouhui <wuzhouhui14@xxxxxxxxxxxxxxxx> 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.
