From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 13:21:04 +0100 Organization: Probably a good idea 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 1427372504 23771 80.91.229.3 (26 Mar 2015 12:21:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 12:21:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 13:21:35 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 1Yb6mj-0004Yw-Pl for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 13:21:17 +0100 Original-Received: from localhost ([::1]:44258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6mj-0007lN-3D for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 08:21:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6mU-0007kb-6w for emacs-devel@gnu.org; Thu, 26 Mar 2015 08:21:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb6mR-0004id-G1 for emacs-devel@gnu.org; Thu, 26 Mar 2015 08:21:02 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:51267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6mR-0004iR-8p for emacs-devel@gnu.org; Thu, 26 Mar 2015 08:20:59 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Yb6mD-00048o-E7 for emacs-devel@gnu.org; Thu, 26 Mar 2015 13:20:50 +0100 Original-Received: from rainey.bang.priv.no ([212.110.185.190]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Mar 2015 13:20:40 +0100 Original-Received: from sb by rainey.bang.priv.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Mar 2015 13:20:40 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: rainey.bang.priv.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:E+bpEnwNstDWQdFC+oTt7Zycvhs= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184321 Archived-At: >>>>> Harald Hanche-Olsen : >> MM lisp/ChangeLog > That's your merge conflict. > I have to go now, no time for the next couple hours. But perhaps > someone else will give you advice. 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)