Re: how to automatically open conflicted files when "git rebase" encounter conflict

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
From: Erik Cervin Edin <erik@xxxxxxxxxxx>
Date: Fri, 18 Mar 2022 17:01:36 +0100
Cc: wuzhouhui <wuzhouhui14@xxxxxxxxxxxxxxxx>, git@xxxxxxxxxxxxxxx
In-reply-to: <xmqqtubvc32q.fsf@gitster.g>
References: <bc7b04de-17be-df86-1c93-792903eeec9b@mails.ucas.ac.cn> <xmqqtubvc32q.fsf@gitster.g>

On Fri, Mar 18, 2022 at 4:38 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Perhaps take "git jump" from contrib/ and do
>
>     $ GIT_EDITOR=vi git jump merge

This looks interesting. Thanks Junio

References:
- how to automatically open conflicted files when "git rebase" encounter conflict
  - From: wuzhouhui
- Re: how to automatically open conflicted files when "git rebase" encounter conflict
  - From: Junio C Hamano

Prev by Date: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Next by Date: Re: C99 %zu support (on MSVC) (was: [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref)
Previous by thread: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Next by thread: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]

Powered by Linux