From: Richard Copley <rcopley@gmail.com>
To: Noam Postavsky <npostavs@gmail.com>
Cc: Glenn Morris <rgm@gnu.org>,
Stefan Monnier <monnier@iro.umontreal.ca>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26)
Date: Wed, 15 May 2019 23:29:58 +0100 [thread overview]
Message-ID: <CAPM58ojpZnAui4+xZtyE2csrF56XsYbKsj_AdEJ20bnAqMtcaQ@mail.gmail.com> (raw)
In-Reply-To: <CAM-tV-8AQpveOdEwpXifer=V96Eb+DFZ4bt7=Caokye2azJBRQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2435 bytes --]
On Wed, 15 May 2019 at 22:12, Noam Postavsky <npostavs@gmail.com> wrote:
> Meanwhile, general git question for the list: Is there a way to ask
> git, given a merge commit, where conflicts occurred/were resolved?
> Even just tracking down the two relevant conflicting commits here was
> a bit annoying, never mind narrowing down to the relevant hunks.
>
I'm no git guru, but here's what occurred to me: repeat the merge,
then use git blame on the conflicted file.
git checkout 5fe9375a51^1
git merge 5fe9375a51^2 | grep CONFLICT
CONFLICT (content): Merge conflict in lisp/textmodes/sgml-mode.el
CONFLICT (content): Merge conflict in lisp/files.el
git blame -n lisp/textmodes/sgml-mode.el | sed -n '/<<</,/>>>/p'
[Here I've manually removed the timestamps and truncated at column 70]
00000000000 342 (Not Committed Yet 342) <<<<<<< HEAD
e99a1241108 346 (Stefan Monnier 343) ;; Double quotes outs
e99a1241108 347 (Stefan Monnier 344) ;; hiding tags. We u
e99a1241108 348 (Stefan Monnier 345) ;; if it's outside of
e99a1241108 349 (Stefan Monnier 346) ;; the resulting numb
e99a1241108 350 (Stefan Monnier 347) ;; (bug#33887), so we
e99a1241108 351 (Stefan Monnier 348) ;; of quotes that doe
e99a1241108 352 (Stefan Monnier 349) ("\\(\"\\)[^\"<>]*[<>
e99a1241108 353 (Stefan Monnier 350) (1 (unless (eq ?\" (
e99a1241108 354 (Stefan Monnier 351) ;; Be careful t
e99a1241108 355 (Stefan Monnier 352) ;; we're going
e99a1241108 356 (Stefan Monnier 353) ;; just compute
e99a1241108 357 (Stefan Monnier 354) (if (prog1 (zer
e99a1241108 358 (Stefan Monnier 355) (goto-cha
e99a1241108 359 (Stefan Monnier 356) (string-to-
e99a1241108 360 (Stefan Monnier 357) )))
00000000000 358 (Not Committed Yet 358) =======
7dab3ee7ab5 350 (Noam Postavsky 359) ;; Quotes outside of
d392b6e8246 355 (Tom Tromey 360) ;; Be careful to call
d392b6e8246 356 (Tom Tromey 361) ;; going to change, s
7dab3ee7ab5 353 (Noam Postavsky 362) ("[\"']" (0 (if (prog
7dab3ee7ab5 354 (Noam Postavsky 363) (go
7dab3ee7ab5 355 (Noam Postavsky 364) (stri
00000000000 365 (Not Committed Yet 365) >>>>>>> 5fe9375a51^2
[-- Attachment #2: Type: text/html, Size: 3581 bytes --]
next prev parent reply other threads:[~2019-05-15 22:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190515001827.19811.454@vcs0.savannah.gnu.org>
[not found] ` <20190515001830.743C9206A2@vcs0.savannah.gnu.org>
2019-05-15 0:38 ` master 5fe9375 2/3: Merge from origin/emacs-26 Glenn Morris
2019-05-15 3:02 ` Noam Postavsky
2019-05-15 20:39 ` Glenn Morris
2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky
2019-05-15 22:29 ` Richard Copley [this message]
2019-05-15 23:06 ` master 5fe9375 2/3: Merge from origin/emacs-26 Noam Postavsky
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=CAPM58ojpZnAui4+xZtyE2csrF56XsYbKsj_AdEJ20bnAqMtcaQ@mail.gmail.com \
--to=rcopley@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=npostavs@gmail.com \
--cc=rgm@gnu.org \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.