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: git pull fails with merge conflicts. How can this possibly happen? Date: Sat, 15 Nov 2014 10:14:07 +0200 Message-ID: <838ujchods.fsf@gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416039286 16600 80.91.229.3 (15 Nov 2014 08:14:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 08:14:46 +0000 (UTC) Cc: acm@muc.de, david@porkrind.org, emacs-devel@gnu.org To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 09:14:39 2014 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 1XpYVC-0001co-3e for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 09:14:38 +0100 Original-Received: from localhost ([::1]:39435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYVB-00057K-Jk for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 03:14:37 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYV3-00057D-PG for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:14:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpYUy-0000Kb-U3 for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:14:29 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:37508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYUy-0000KV-HX for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:14:24 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NF200800MLW6H00@mtaout27.012.net.il> for emacs-devel@gnu.org; Sat, 15 Nov 2014 10:09:39 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF200NQHMO34880@mtaout27.012.net.il>; Sat, 15 Nov 2014 10:09:39 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 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:177146 Archived-At: > Date: Sat, 15 Nov 2014 12:41:12 +0700 > From: Yuri Khan > Cc: Emacs developers , David Caldwell > > On Sat, Nov 15, 2014 at 3:54 AM, Alan Mackenzie wrote: > > > gitk doesn't work on my system, of course. (Nothing ever does without a > > lot of effort). > > I want to propose a couple of rules of thumb for beginner Git users. I'm sorry, but after using Git for a year on several live projects, I cannot disagree more with your rules. They in fact make a research project from each synchronization with upstream and each browsing of the commit history. There's no justification for such complexity, certainly not for beginners. Your suggestions are in fact anti-pedagogical, because they turn the learning process on its head: instead of starting with simple stuff, then gradually learning more and deeper, you suggest that they start with the complex stuff first. This makes very little sense to me. I don't use gitk or anything similar, and yet I have no problems looking at the commit log. I don't feel blind. I also never needed to use 'fetch', except exactly once, when Andreas deleted a branch -- something that shouldn't happen frequently, so it's an exception rather than the rule. No problems with "git pull" here, none whatsoever. (And yes, from my 1-year experience place I do know about the pitfalls of 'pull', I just never saw them in any of the projects I'm involved in. Spreading FUD of the kind that you did about 'pull' is IMO making a disservice to those whom you want to help.) Bottom line, if the beginners follow some simple workflow, like the one written on the Wiki, they will never get themselves in trouble with 'log' and 'pull'. Mind you, I come from the same population of the confused whom you are trying to teach here: my mind still doesn't wrap itself easily around Git semantics, and I still don't feel comfortable with Git as I do with bzr and CVS. But I can assure everyone here that Yuri's rules do not need to be followed in order to use Git correctly and almost seamlessly. Just find your preferred workflow, document it in some notes if you don't trust your memory, and follow it every day. You don't need to know any fancy complicated commands.