From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 07:58:05 +0900 Message-ID: <87sicffqma.fsf@uwakimon.sk.tsukuba.ac.jp> References: <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> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <83oan3onki.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428188321 22858 80.91.229.3 (4 Apr 2015 22:58:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 22:58:41 +0000 (UTC) Cc: martin rudalics , sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 00:58:31 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 1YeX1K-0002vn-9T for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 00:58:30 +0200 Original-Received: from localhost ([::1]:34573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeX1J-00037l-KR for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:58:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeX1F-00037V-M9 for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:58:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeX1E-0000nK-Oc for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:58:25 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:45798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeX1A-0000aW-T1; Sat, 04 Apr 2015 18:58:21 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 014211C392D; Sun, 5 Apr 2015 07:58:06 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id D25F6120EC9; Sun, 5 Apr 2015 07:58:05 +0900 (JST) In-Reply-To: <83oan3onki.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184893 Archived-At: Eli Zaretskii writes: > > And we probably should tell what happened after git pull with > > the following > > > > error: Your local changes to the following files would be > > overwritten by merge: > > ... > > Please, commit your changes or stash them before you can merge. > > Aborting > > > > > > AFAICT this signlas a succeeding fetch and a failing merge. > > Yes, and I already added that, please take another look. I looked at the current version. If the uncommitted files were inadvertant (typical beginner mistake), your advice to commit, pull again, and fix the conflicts is appropriate. But this doesn't work for Richard, who deliberately leaves some changes uncommitted. I see two ways to deal with this. Ignore Richard (and Alan, at least) for the purpose of GitQuickStartForEmacsDevs, and preface the paragraph below "Conflicts in uncommitted changes" that starts "To fix this" with "If you accidentally forgot to commit these changes, you can fix this ...". Alternatively, recommend stash-pull-stashpop, but Alan at least objects to the extra commands.