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: Fri, 03 Apr 2015 14:33:13 +0300 Message-ID: <83mw2pphty.fsf@gnu.org> References: <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> <86384lciin.fsf@dod.no> <86r3s1acxv.fsf@dod.no> <83twwxpsbg.fsf@gnu.org> <86k2xta7mr.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428060832 1612 80.91.229.3 (3 Apr 2015 11:33:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 11:33:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 13:33:39 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 1Ydzqy-0000Wa-ND for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 13:33:36 +0200 Original-Received: from localhost ([::1]:33673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzqy-0002Ub-63 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 07:33:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzqk-0002Tf-Bg for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:33:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydzqg-0005A1-Vu for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:33:22 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:64625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzqg-00059a-Ow for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:33:18 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NM800E00AQCXF00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 14:33:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM800EH5ARHVN30@a-mtaout20.012.net.il>; Fri, 03 Apr 2015 14:33:17 +0300 (IDT) In-reply-to: <86k2xta7mr.fsf@dod.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184830 Archived-At: > From: Steinar Bang > Date: Fri, 03 Apr 2015 11:22:36 +0200 > > >>>>> Eli Zaretskii : > > > So why would Richard need to use "stash" in this situation? It sounds > > like an unnecessary complication. > > No, you're right. Keep it simple, no stash or rebase in the examples. > > To commit: > git commit > git push > > If push fails: > git pull > git push > > If pull fails with conflicts, fix the conflict markers like in CVS, then > git commit > git push Thanks.