From: Junio C Hamano <gitster@pobox.com>
To: wuzhouhui <wuzhouhui14@mails.ucas.ac.cn>
Cc: git@vger.kernel.org
Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Date: Thu, 17 Mar 2022 21:11:25 -0700 [thread overview]
Message-ID: <xmqqtubvc32q.fsf@gitster.g> (raw)
In-Reply-To: <bc7b04de-17be-df86-1c93-792903eeec9b@mails.ucas.ac.cn> (wuzhouhui's message of "Fri, 18 Mar 2022 10:00:52 +0800")
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
next prev parent reply other threads:[~2022-03-18 4:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 2:00 how to automatically open conflicted files when "git rebase" encounter conflict wuzhouhui
2022-03-18 4:11 ` Junio C Hamano [this message]
2022-03-18 16:01 ` Erik Cervin Edin
2022-03-19 2:01 ` wuzhouhui
2022-03-18 16:00 ` Erik Cervin Edin
2022-03-18 18:24 ` Junio C Hamano
2022-03-18 20:14 ` brian m. carlson
2022-03-18 21:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtubvc32q.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=wuzhouhui14@mails.ucas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.