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: VC mode and git Date: Tue, 31 Mar 2015 17:07:36 +0300 Message-ID: <838uedtg47.fsf@gnu.org> References: <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <86ego5qoj1.fsf@example.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427810920 27052 80.91.229.3 (31 Mar 2015 14:08:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:08:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sebastien Vauban Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:08:33 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 1YcwqA-0008Gn-3G for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:08:26 +0200 Original-Received: from localhost ([::1]:38868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycwq8-000884-LW for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:08:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycwpm-00083j-Id for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:08:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycwph-0005Wr-Ch for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:08:02 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:58171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycwph-0005Wd-5o for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:07:57 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NM200400XWUL500@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Tue, 31 Mar 2015 17:07:51 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM2004REXX1HR70@a-mtaout23.012.net.il>; Tue, 31 Mar 2015 17:07:51 +0300 (IDT) In-reply-to: <86ego5qoj1.fsf@example.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:184631 Archived-At: > From: Sebastien Vauban > Date: Tue, 31 Mar 2015 15:34:10 +0200 > > > With git pull, if there are changes in the working directory, the > > merge (i.e. merge from remote/master into master) part of the > > operation is aborted before it starts, giving a message describing its > > refusal. It does this even when there are no conflicts to deal with. > > What are we supposed to do in that case, if we're not yet ready to > commit our files? Nothing, IME. Contrary to the cited text, "git pull" with uncommitted changes doesn't fail. I do this every time before committing a changeset I intend to push, and it always worked for me. By contrast, if you do commit, and _then_ pull, your pull might fail to merge the new stuff from upstream, and _then_ you'd need to do something to fix that. (I usually just "git reset HEAD^" and pull again, then commit my changes again, after fixing the ChangeLog entries to be in the correct order.)