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: VC mode and git Date: Sun, 05 Apr 2015 00:09:00 +0200 Organization: Probably a good idea Message-ID: <86619b8s1v.fsf@dod.no> References: <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> <86bnj59rjj.fsf@dod.no> <83wq1snd0k.fsf@gnu.org> <86vbhb9auh.fsf@dod.no> <83sicfoqtp.fsf@gnu.org> <86mw2n98o9.fsf@dod.no> <552012FE.2000702@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428185451 12532 80.91.229.3 (4 Apr 2015 22:10:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 22:10:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 00:10:45 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 1YeWH6-0003V9-60 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 00:10:44 +0200 Original-Received: from localhost ([::1]:34483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWH5-0001ik-G1 for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:10:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWGZ-0001iU-PV for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:10:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeWGW-0006WK-HX for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:10:11 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:35847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWGW-0006V5-7d for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:10:08 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeWGS-00031J-CB for emacs-devel@gnu.org; Sun, 05 Apr 2015 00:10:04 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 00:10:04 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 00:10:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:/QzfQK3fGCJL/kVTXpN2HiR4SMg= 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:184889 Archived-At: >>>>> martin rudalics : >> The only way to make git do the merge is to move away the uncommitted >> changes, either by committing them, > IIUC this will fail miserably with > git commit -a > as I sketched in the scenario I posted earlier. I think your problem in the scenario you posted was that one of your merges with conflict didn't get committed, and git refused to do anything else on that branch until it was committed or reset. Possibly ChangeLog wasn't staged for commit once the conflict markers had been removed? Possibly there were conflicts in other files.