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 10:30:13 +0200 Message-ID: <551FA115.5090400@gmx.at> 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> 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 1428136253 27061 80.91.229.3 (4 Apr 2015 08:30:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 08:30:53 +0000 (UTC) Cc: sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii , "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 10:30:45 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 1YeJTW-0005zK-Ok for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 10:30:42 +0200 Original-Received: from localhost ([::1]:36651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJTV-0000k7-UY for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 04:30:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJTR-0000iy-P8 for emacs-devel@gnu.org; Sat, 04 Apr 2015 04:30:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeJTM-0008EG-QG for emacs-devel@gnu.org; Sat, 04 Apr 2015 04:30:37 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:50428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJTM-0008Ac-HN; Sat, 04 Apr 2015 04:30:32 -0400 Original-Received: from [194.118.143.212] ([194.118.143.212]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0MaaOf-1YtVu33rdR-00K6H2; Sat, 04 Apr 2015 10:30:23 +0200 In-Reply-To: <837ftspcis.fsf@gnu.org> X-Provags-ID: V03:K0:hlzvAVDsfkRJL3YFNJJM+OpO/guWkS3xsw0XILamnHiVcVRmgsh VCA2/M+fcPhtcAK2yANMZ3XWbEmxJmL7xQ4Brwo8mbwsH378dl3igpm78lrabizgQ4guLzI KJCfx6jEsTa7ARd/8tn3PAzbCeoEO2qi/kHe8yBIl66Opv+m9n53iUk0VrJGle/EpPbQ/zx GTGInzeerG4J49xLcYoRw== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.18 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:184855 Archived-At: > I gathered enough stuff in this thread to fix GitQuickStartForEmacsDevs, > to which I'd appreciate comments from everyone who has a moment to > spare. Thanks. Please consider the following: (1) Say that a pull is a fetch plus a merge and what these do. (2) Distinguish the two ways a merge can fail: The one where git refuses to merge because it would overwrite changes and the second one where it detects conflicts. And how to deal with them. (3) Mention both stashing and rebasing. IMO it's no use ignoring them. People will find them in the manuals and tutorials and we should at least tell them why the method we propose here is sufficient or better. martin