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:30:04 +0300 Message-ID: <83619htf2r.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <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> <551A59F1.3060602@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427812279 19891 80.91.229.3 (31 Mar 2015 14:31:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:31:19 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, hanche@math.ntnu.no, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:31:09 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 1YcxBk-0000Xo-KW for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:30:44 +0200 Original-Received: from localhost ([::1]:39006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxBe-0002ks-UX for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:30:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxBa-0002kj-86 for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:30:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcxBW-0004nA-H3 for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:30:33 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:55908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxBW-0004mw-8Y; Tue, 31 Mar 2015 10:30:30 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM200D00YUR5S00@a-mtaout22.012.net.il>; Tue, 31 Mar 2015 17:30:16 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM200CCRYYFJCB0@a-mtaout22.012.net.il>; Tue, 31 Mar 2015 17:30:16 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184636 Archived-At: > Date: Tue, 31 Mar 2015 10:07:26 -0400 > From: Richard Stallman > Cc: schwab@suse.de, stephen@xemacs.org, emacs-devel@gnu.org > > It usually takes weeks from when I write a change to when I check it > in to Savannah. To check them in, I must first get the latest changes > from Savannah. If I can't do a pull in that state, how can I ever > check them in? IME, the only situation where a pull can fail if you have uncommitted changes is when your changes touch the same portions that were meanwhile modified by someone else's commits in the repository. Then you'd have a merge conflict, and will have to fix it manually. Otherwise, I always pull before committing in my local mirror, and it generally doesn't fail.