From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.devel 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 Message-ID: References: <20190515001827.19811.454@vcs0.savannah.gnu.org> <20190515001830.743C9206A2@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000000e38780588f4b208" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="38713"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Glenn Morris , Stefan Monnier , Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 16 00:30:38 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 1hR2Q1-0009vk-EO for ged-emacs-devel@m.gmane.org; Thu, 16 May 2019 00:30:37 +0200 Original-Received: from localhost ([127.0.0.1]:43607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR2Q0-0002Im-A7 for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 18:30:36 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:47284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR2Pt-0002Ic-3i for emacs-devel@gnu.org; Wed, 15 May 2019 18:30:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR2Pr-0006qB-R8 for emacs-devel@gnu.org; Wed, 15 May 2019 18:30:29 -0400 Original-Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:40544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hR2Pp-0006jW-Qd; Wed, 15 May 2019 18:30:25 -0400 Original-Received: by mail-oi1-x233.google.com with SMTP id r136so1033929oie.7; Wed, 15 May 2019 15:30:25 -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=B/Kd4sFRcUWW47j9EB1IRwIp2xqNPum7Hg41rKpvGjs=; b=cE6+w1+2CcXjTrYHg/VoWL5+Cksjlg0EFQes33Sh4KGEtvASzUGZmkvLdS1G4arRc+ Z3zQDbzWapshsmX6eUb5P3ScO8c5j1wa0+aFEzn7c0bRuimz9ub9755a9QP0gSSx05Ss t0+N0Fd2LqDu3O/lHvFoVrRkZKjRjy4WREfOnLDHGb5f6YgBmBWMG4XZ+qbU4orwf0am a2Kw1AzGtEUudR2S0OD/XJIoPTye3O2AgKDjng4McGwTAD3tmcCB9em8K/fAqB/P7j9L fFzVImLbWFBzb63jOQXThg1HgeA6oCe7Rn2b1aKE/3sto+WaT0tOImHC5dvvSDnY/7+O cC6A== 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=B/Kd4sFRcUWW47j9EB1IRwIp2xqNPum7Hg41rKpvGjs=; b=oApAv6EIuzUYfMpWIUVl6+4+vAQMqz4zX1kohyjri1WBHWaBVVm8o7LopwkRL0hWET VDhZ2SAUPSxhXh99j1mDdq/0aRDPtp+eTstlGH4bTr4OUgfUAL9gCJIX+3umofXWGdI8 m4pO2YwcuTg1xJKWOMs/+kvmM6N+AvN8nw/BTmANoH8HiW1BLExS4GLs3J3SXxdBCt4v GNEUlFwSOfjUGnNA0QJLAtHlYaFBhi+f4QF2CXwjJW0dPrDa5YgMI5LvB6R4pNC8rQ0w txtZQCE/552hDarksLITxjrHEJ80raZ8Z1a3HNrrqLNjMidUSKghCZLPLPk9vfUworqC zBXg== X-Gm-Message-State: APjAAAWhKv3OSUGWxbusRM8Txyr/z5J/WmzL2Q7cNDncABFhn1AB2ATK PyrzDvQpylGNbRjRoO8cL7eRLEa+VB2wOG+6neM= X-Google-Smtp-Source: APXvYqyWY/Rvo29M+Xi/DWMBwRp23C4EQE1Grnwupo+g7iFbg2O8VkNXij8fDwmrm2GvbNks3GcS7zieTB+WEezu6qQ= X-Received: by 2002:aca:3906:: with SMTP id g6mr2135196oia.106.1557959424225; Wed, 15 May 2019 15:30:24 -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::233 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:236558 Archived-At: --0000000000000e38780588f4b208 Content-Type: text/plain; charset="UTF-8" On Wed, 15 May 2019 at 22:12, Noam Postavsky 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 --0000000000000e38780588f4b208 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+PGRpdiBkaXI9Imx0ciI+PGRpdiBkaXI9Imx0ciI+PGRpdiBkaXI9Imx0 ciI+PGRpdiBkaXI9Imx0ciI+DQo8ZGl2Pg0KPHNwYW4gY2xhc3M9ImdtYWlsLWltIj48ZGl2IGRp cj0ibHRyIiBjbGFzcz0iZ21haWxfYXR0ciI+T24gV2VkLCAxNSBNYXkgMjAxOSBhdCAyMjoxMiwg Tm9hbSBQb3N0YXZza3kgJmx0OzxhIGhyZWY9Im1haWx0bzpucG9zdGF2c0BnbWFpbC5jb20iIHRh cmdldD0iX2JsYW5rIj5ucG9zdGF2c0BnbWFpbC5jb208L2E+Jmd0OyB3cm90ZTo8YnI+PC9kaXY+ PGJsb2NrcXVvdGUgY2xhc3M9ImdtYWlsX3F1b3RlIiBzdHlsZT0ibWFyZ2luOjBweCAwcHggMHB4 IDAuOGV4O2JvcmRlci1sZWZ0OjFweCBzb2xpZCByZ2IoMjA0LDIwNCwyMDQpO3BhZGRpbmctbGVm dDoxZXgiPg0KTWVhbndoaWxlLCBnZW5lcmFsIGdpdCBxdWVzdGlvbiBmb3IgdGhlIGxpc3Q6IElz IHRoZXJlIGEgd2F5IHRvIGFzazxicj4NCmdpdCwgZ2l2ZW4gYSBtZXJnZSBjb21taXQsIHdoZXJl IGNvbmZsaWN0cyBvY2N1cnJlZC93ZXJlIHJlc29sdmVkPzxicj4NCkV2ZW4ganVzdCB0cmFja2lu ZyBkb3duIHRoZSB0d28gcmVsZXZhbnQgY29uZmxpY3RpbmcgY29tbWl0cyBoZXJlIHdhczxicj4N CmEgYml0IGFubm95aW5nLCBuZXZlciBtaW5kIG5hcnJvd2luZyBkb3duIHRvIHRoZSByZWxldmFu dCBodW5rcy48YnI+DQo8L2Jsb2NrcXVvdGU+PGRpdj48L2Rpdj48L3NwYW4+DQoNCjwvZGl2Pjxk aXY+PGJyPjwvZGl2PkkmIzM5O20gbm8gZ2l0IGd1cnUsIGJ1dCBoZXJlJiMzOTtzIHdoYXQgb2Nj dXJyZWQgdG8gbWU6IHJlcGVhdCB0aGUgbWVyZ2UsPGJyPnRoZW4gdXNlIGdpdCBibGFtZSBvbiB0 aGUgY29uZmxpY3RlZCBmaWxlLjxicj48YnI+PC9kaXY+PGRpdiBkaXI9Imx0ciI+Z2l0IGNoZWNr b3V0IDVmZTkzNzVhNTFeMTxicj5naXQgbWVyZ2UgNWZlOTM3NWE1MV4yIHwgZ3JlcCBDT05GTElD VDxicj48YnI+Q09ORkxJQ1QgKGNvbnRlbnQpOiBNZXJnZSBjb25mbGljdCBpbiBsaXNwL3RleHRt b2Rlcy9zZ21sLW1vZGUuZWw8YnI+Q09ORkxJQ1QgKGNvbnRlbnQpOiBNZXJnZSBjb25mbGljdCBp biBsaXNwL2ZpbGVzLmVsPGJyPjxicj5naXQgYmxhbWUgLW4gbGlzcC90ZXh0bW9kZXMvc2dtbC1t b2RlLmVsIHwgc2VkIC1uICYjMzk7LyZsdDsmbHQ7Jmx0Oy8sLyZndDsmZ3Q7Jmd0Oy9wJiMzOTs8 YnI+PC9kaXY+PGRpdiBkaXI9Imx0ciI+PGJyPjwvZGl2PjxkaXY+W0hlcmUgSSYjMzk7dmUgbWFu dWFsbHkgcmVtb3ZlZCB0aGUgdGltZXN0YW1wcyBhbmQgdHJ1bmNhdGVkIGF0IGNvbHVtbiA3MF08 YnI+PC9kaXY+PGRpdiBkaXI9Imx0ciI+PC9kaXY+PGRpdiBkaXI9Imx0ciI+PGJyPjAwMDAwMDAw MDAwwqAgMzQyIChOb3QgQ29tbWl0dGVkIFlldMKgwqDCoCAzNDIpICZsdDsmbHQ7Jmx0OyZsdDsm bHQ7Jmx0OyZsdDsgSEVBRDxicj5lOTlhMTI0MTEwOMKgIDM0NiAoU3RlZmFuIE1vbm5pZXLCoMKg wqDCoMKgwqAgMzQzKcKgwqDCoMKgwqAgOzsgRG91YmxlIHF1b3RlcyBvdXRzPGJyPmU5OWExMjQx MTA4wqAgMzQ3IChTdGVmYW4gTW9ubmllcsKgwqDCoMKgwqDCoCAzNDQpwqDCoMKgwqDCoCA7OyBo aWRpbmcgdGFncy7CoCBXZSB1PGJyPmU5OWExMjQxMTA4wqAgMzQ4IChTdGVmYW4gTW9ubmllcsKg wqDCoMKgwqDCoCAzNDUpwqDCoMKgwqDCoCA7OyBpZiBpdCYjMzk7cyBvdXRzaWRlIG9mPGJyPmU5 OWExMjQxMTA4wqAgMzQ5IChTdGVmYW4gTW9ubmllcsKgwqDCoMKgwqDCoCAzNDYpwqDCoMKgwqDC oCA7OyB0aGUgcmVzdWx0aW5nIG51bWI8YnI+ZTk5YTEyNDExMDjCoCAzNTAgKFN0ZWZhbiBNb25u aWVywqDCoMKgwqDCoMKgIDM0NynCoMKgwqDCoMKgIDs7IChidWcjMzM4ODcpLCBzbyB3ZTxicj5l OTlhMTI0MTEwOMKgIDM1MSAoU3RlZmFuIE1vbm5pZXLCoMKgwqDCoMKgwqAgMzQ4KcKgwqDCoMKg wqAgOzsgb2YgcXVvdGVzIHRoYXQgZG9lPGJyPmU5OWExMjQxMTA4wqAgMzUyIChTdGVmYW4gTW9u bmllcsKgwqDCoMKgwqDCoCAzNDkpwqDCoMKgwqDCoCAoJnF1b3Q7XFwoXCZxdW90O1xcKVteXCZx dW90OyZsdDsmZ3Q7XSpbJmx0OyZndDs8YnI+ZTk5YTEyNDExMDjCoCAzNTMgKFN0ZWZhbiBNb25u aWVywqDCoMKgwqDCoMKgIDM1MCnCoMKgwqDCoMKgwqAgKDEgKHVubGVzcyAoZXEgP1wmcXVvdDsg KDxicj5lOTlhMTI0MTEwOMKgIDM1NCAoU3RlZmFuIE1vbm5pZXLCoMKgwqDCoMKgwqAgMzUxKcKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgQmUgY2FyZWZ1bCB0PGJyPmU5OWExMjQxMTA4wqAgMzU1 IChTdGVmYW4gTW9ubmllcsKgwqDCoMKgwqDCoCAzNTIpwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyB3ZSYjMzk7cmUgZ29pbmcgPGJyPmU5OWExMjQxMTA4wqAgMzU2IChTdGVmYW4gTW9ubmllcsKg wqDCoMKgwqDCoCAzNTMpwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBqdXN0IGNvbXB1dGU8YnI+ ZTk5YTEyNDExMDjCoCAzNTcgKFN0ZWZhbiBNb25uaWVywqDCoMKgwqDCoMKgIDM1NCnCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChpZiAocHJvZzEgKHplcjxicj5lOTlhMTI0MTEwOMKgIDM1OCAoU3Rl ZmFuIE1vbm5pZXLCoMKgwqDCoMKgwqAgMzU1KcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGdvdG8tY2hhPGJyPmU5OWExMjQxMTA4wqAgMzU5IChTdGVmYW4gTW9ubmllcsKgwqDC oMKgwqDCoCAzNTYpwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctdG8tPGJy PmU5OWExMjQxMTA4wqAgMzYwIChTdGVmYW4gTW9ubmllcsKgwqDCoMKgwqDCoCAzNTcpwqDCoMKg wqDCoCApKSk8YnI+MDAwMDAwMDAwMDDCoCAzNTggKE5vdCBDb21taXR0ZWQgWWV0wqDCoMKgIDM1 OCkgPT09PT09PTxicj43ZGFiM2VlN2FiNcKgIDM1MCAoTm9hbSBQb3N0YXZza3nCoMKgwqDCoMKg wqAgMzU5KcKgwqDCoMKgwqAgOzsgUXVvdGVzIG91dHNpZGUgb2YgPGJyPmQzOTJiNmU4MjQ2wqAg MzU1IChUb20gVHJvbWV5wqDCoMKgwqDCoMKgwqDCoMKgwqAgMzYwKcKgwqDCoMKgwqAgOzsgQmUg Y2FyZWZ1bCB0byBjYWxsPGJyPmQzOTJiNmU4MjQ2wqAgMzU2IChUb20gVHJvbWV5wqDCoMKgwqDC oMKgwqDCoMKgwqAgMzYxKcKgwqDCoMKgwqAgOzsgZ29pbmcgdG8gY2hhbmdlLCBzPGJyPjdkYWIz ZWU3YWI1wqAgMzUzIChOb2FtIFBvc3RhdnNrecKgwqDCoMKgwqDCoCAzNjIpwqDCoMKgwqDCoCAo JnF1b3Q7W1wmcXVvdDsmIzM5O10mcXVvdDsgKDAgKGlmIChwcm9nPGJyPjdkYWIzZWU3YWI1wqAg MzU0IChOb2FtIFBvc3RhdnNrecKgwqDCoMKgwqDCoCAzNjMpwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZ288YnI+N2RhYjNlZTdhYjXCoCAzNTUgKE5vYW0g UG9zdGF2c2t5wqDCoMKgwqDCoMKgIDM2NCnCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKHN0cmk8YnI+MDAwMDAwMDAwMDDCoCAzNjUgKE5vdCBDb21taXR0ZWQgWWV0 wqDCoMKgIDM2NSkgJmd0OyZndDsmZ3Q7Jmd0OyZndDsmZ3Q7Jmd0OyA1ZmU5Mzc1YTUxXjLCoMKg wqDCoMKgIDxicj48YnI+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+DQo= --0000000000000e38780588f4b208--