From: Junio C Hamano <gitster@pobox.com>
To: Erik Cervin Edin <erik@cervined.in>
Cc: wuzhouhui <wuzhouhui14@mails.ucas.ac.cn>, git@vger.kernel.org
Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict
Date: Fri, 18 Mar 2022 11:24:10 -0700 [thread overview]
Message-ID: <xmqqpmmj9l11.fsf@gitster.g> (raw)
In-Reply-To: <CA+JQ7M8_QiidajaWJpz3gFeUXiLMLiDA38W1mnWyxnMLJN3fpQ@mail.gmail.com> (Erik Cervin Edin's message of "Fri, 18 Mar 2022 17:00:37 +0100")
Erik Cervin Edin <erik@cervined.in> writes:
> In the situations of more complicated conflicts (as well as the
> functionality you request) can be invoked using
> git mergetool
> git mergetool -- 'pathspec'
> git mergetool --tool=vimdiff -- 'pathspec'
Yeah, I forgot all about "git mergetool". I think that is the
official answer to the original question.
next prev parent reply other threads:[~2022-03-18 18:24 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
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 [this message]
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=xmqqpmmj9l11.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=erik@cervined.in \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).