From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 10:16:41 -0400 Message-ID: References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> <5513E96D.8070204@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427379445 15666 80.91.229.3 (26 Mar 2015 14:17:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 14:17:25 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 15:17:15 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yb8as-000559-P5 for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 15:17:10 +0100 Original-Received: from localhost ([::1]:44722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb8ar-0000ko-PS for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 10:17:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb8aV-0000dW-Fc for emacs-devel@gnu.org; Thu, 26 Mar 2015 10:16:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb8aP-0002uq-PH for emacs-devel@gnu.org; Thu, 26 Mar 2015 10:16:47 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:45427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb8aP-0002um-Lz for emacs-devel@gnu.org; Thu, 26 Mar 2015 10:16:41 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVRBbthL/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4KCws0EhQYDYg3ohGMDgUHAUkJAwECgz4DUoMeBKg7 X-IPAS-Result: AgUFAGvvdVRBbthL/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4KCws0EhQYDYg3ohGMDgUHAUkJAwECgz4DUoMeBKg7 X-IronPort-AV: E=Sophos;i="5.01,1,1400040000"; d="scan'208";a="114646981" Original-Received: from 65-110-216-75.cpe.pppoe.ca (HELO pastel.home) ([65.110.216.75]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 26 Mar 2015 10:16:41 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 246EF2441; Thu, 26 Mar 2015 10:16:41 -0400 (EDT) In-Reply-To: (Steinar Bang's message of "Thu, 26 Mar 2015 13:21:04 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184330 Archived-At: > What I would do here is to open the ChangeLog in emacs and look for the > conflict markers (search for "<<" (without the quotes)) and see if they > make sense to me. I then manually edit the result to what I want (I > remove the conflict markers, then either pick one of the alternatives, > both alternatives, or make a manual merge of the two, depending on what > the conflict is). > Once I'm satisfied with the results, I stage the ChangeLog file for the > merge commit: > git add lisp/ChangeLog And if all went according to plan, Emacs-25 would have already done this "git add" when you saved the file after removing the conflict markers. Stefan