From: Noam Postavsky <npostavs@gmail.com>
To: Glenn Morris <rgm@gnu.org>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>,
Emacs developers <emacs-devel@gnu.org>
Subject: 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 16:50:59 -0400 [thread overview]
Message-ID: <CAM-tV-8AQpveOdEwpXifer=V96Eb+DFZ4bt7=Caokye2azJBRQ@mail.gmail.com> (raw)
In-Reply-To: <tc5zqbbgfm.fsf@fencepost.gnu.org>
On Wed, 15 May 2019 at 16:39, Glenn Morris <rgm@gnu.org> wrote:
> > Yeah, it's fine, [1: e99a124110] in master just happened to remove a
> > :group nearby [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually
> > entirely separated.
>
> Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules?
Oh, you're entirely correct. And I think the resolution indeed isn't
quite right; I'll take a look at it tonight, or perhaps later this
week.
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.
next prev parent reply other threads:[~2019-05-15 20:50 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 ` Noam Postavsky [this message]
2019-05-15 22:29 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Richard Copley
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='CAM-tV-8AQpveOdEwpXifer=V96Eb+DFZ4bt7=Caokye2azJBRQ@mail.gmail.com' \
--to=npostavs@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--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.