From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel 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 Message-ID: References: <20190515001827.19811.454@vcs0.savannah.gnu.org> <20190515001830.743C9206A2@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="269333"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Stefan Monnier , Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 15 23:17:28 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hR1H3-0017Wp-1y for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 23:17:17 +0200 Original-Received: from localhost ([127.0.0.1]:42660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR1Bx-0006W4-S1 for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 17:12:01 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:53562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0s7-0006Xl-13 for emacs-devel@gnu.org; Wed, 15 May 2019 16:51:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0s5-0001hz-Gg for emacs-devel@gnu.org; Wed, 15 May 2019 16:51:30 -0400 Original-Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]:43144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hR0ry-0001ZT-Ts; Wed, 15 May 2019 16:51:24 -0400 Original-Received: by mail-ot1-x32c.google.com with SMTP id i8so1326909oth.10; Wed, 15 May 2019 13:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9ETfR311AcFs37p9xooGBtUsPnQP+wocmpLwo2WaWXU=; b=emWBFY19wHndq35otdNxdFZcQSQv3lJ6LNgZREXXpnXKchc/0MeOMBtovUGneZYNng a9styeHskg4cExq//X/Ui9R98cyuBSFiifbv525eiaPZzcXN0atLAte29bKpSvnFy22Y hw1pYSylNc+pH7m1LnfpjR6e+l3Jk0U18ccmwb8LZNo8DThTTi6IFVZNdTFXheoJOzTY rAjQZ0eopptRrZZLwdD/MHrhYAnkqiNYHXpxv0foXPbwy76sirW02nSm7z9FfB78rTQ1 N6bq6evze45y3aYAsn/QrlkcgqpSoMg51iYvcv7+xgS3Tu6X6/0pc0XUHxQg0IGOy/AR V0hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9ETfR311AcFs37p9xooGBtUsPnQP+wocmpLwo2WaWXU=; b=LO2MaOalfuKC2kVEsHdbijwOFrRpsH229jhBoHZJ5Pn+cH8w6mArAoSE6ICFqyDIRa 57jN8kihn+MAMKVhtxea+7d8WDtbwNIUxDcgm2IaKfjUkbA4zL+3VjurhXPGttSigyI3 aXw/l3aUKRUaOd+XKxLF8OupAqFgE4f6osfCSFi1/W5fqXV30P7ctCeXTrcIEYYnblcV W526iO9nI/ZGbrD2jL4TdzoJ8zOp2BWvUYk/V+yZGkR0GpBmWLuwVHOutx5g4tvGtf17 h0rhj6I/vZnCYDB5Yc4EJTkgAzvpOWRHXqdrxKRRsFO5rQmFvbrmb505nPNoh/FfKkmV yAyQ== X-Gm-Message-State: APjAAAV3sDVf3KD0QawTXleD0+nkVymudZNsyr5CptTKkzyjAqobL9lc x9dTrZo2uTuaToZDhOZ+62HqRWa5bFYh5SPfW1LnFg== X-Google-Smtp-Source: APXvYqw+zmuqIRjXBDs7W4ESAq1Zoe8zlAnOWifbaa37Qn7u1qmQpjSSs0rvT3fFKDvBy9dichphuR49rIYVE2w0D6E= X-Received: by 2002:a9d:4041:: with SMTP id o1mr5021280oti.178.1557953475433; Wed, 15 May 2019 13:51:15 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::32c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236556 Archived-At: On Wed, 15 May 2019 at 16:39, Glenn Morris 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.