From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 18:36:14 +0200 Message-ID: <552012FE.2000702@gmx.at> References: <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1428165411 23583 80.91.229.3 (4 Apr 2015 16:36:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 16:36:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 18:36:43 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 1YeR3p-0006Jy-Nu for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:36:41 +0200 Original-Received: from localhost ([::1]:33709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeR3o-00058Y-TN for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 12:36:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeR3c-00058F-63 for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:36:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeR3Z-000387-1K for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:36:28 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:60458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeR3Y-00037s-OJ for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:36:24 -0400 Original-Received: from [178.189.205.199] ([178.189.205.199]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MHso5-1Yi1QQ2ghB-003dDx for ; Sat, 04 Apr 2015 18:36:23 +0200 In-Reply-To: <86mw2n98o9.fsf@dod.no> X-Provags-ID: V03:K0:71vIFW6hhxbjWSJdN8b6xJ10aI8gzaE5wu9uaaLjBDzZPx8iAg5 4lbXLAlU2PhqaQh4Nq7dJ4LakUakWcyQtgGDBsYGPGBSDuqKIgbXf9tvP62z86RfaSX09/C d46BzWbYzIXaf+3OUUM97ucjFeZ/LqZXH5t78nLWxsz5uaPqAz19/wmClaCK1duwKP32mnu OYm59M2wrZzw6cbFHEJWw== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.22 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:184877 Archived-At: > 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. martin