From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 19:04:48 +0200 Message-ID: <83twx7n0zz.fsf@gnu.org> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> <5513E96D.8070204@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427389586 7327 80.91.229.3 (26 Mar 2015 17:06:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 17:06:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 18:06:18 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 1YbBEP-0005Kz-Hz for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 18:06:09 +0100 Original-Received: from localhost ([::1]:45606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBEO-0001ev-QG for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 13:06:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBDy-0001Zb-I7 for emacs-devel@gnu.org; Thu, 26 Mar 2015 13:05:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbBDv-0005dF-5P for emacs-devel@gnu.org; Thu, 26 Mar 2015 13:05:42 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:53216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBDu-0005d1-RL for emacs-devel@gnu.org; Thu, 26 Mar 2015 13:05:39 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NLT00800WCKCV00@mtaout25.012.net.il> for emacs-devel@gnu.org; Thu, 26 Mar 2015 18:59:59 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLT007U5WJZRW10@mtaout25.012.net.il>; Thu, 26 Mar 2015 18:59:59 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.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:184342 Archived-At: > From: Steinar Bang > Date: Thu, 26 Mar 2015 13:21:04 +0100 > > 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 > > Right now I've told git that I've seen the conflict and have manually > resolved it, and git will complete the merge when I give the following > command: > git commit > > (and as I said in a different post: I usually do this kind of merge > conflict resolution from magit) What's wrong with smerge-mode? It should kick in automatically when you have conflict markers, and also invoke "git add" automatically for every file saved after resolving all of its conflicts.