From: Steffen Prohaska Date: Thu, 25 Oct 2007 10:39:06 GMT Subject: Re: best git practices, was Re: Git User's Survey 2007 unfinished summary continued Message-ID: <6AE2F79A-24EF-4F00-9D3E-742A47865FD1@zib.de> In-Reply-To: On Oct 25, 2007, at 12:07 PM, Johannes Schindelin wrote: > Hi, > > On Thu, 25 Oct 2007, Andreas Ericsson wrote: > >> Jakub Narebski wrote: >>> On 10/24/07, Andreas Ericsson wrote: >>> >>>> git pull. Not git push. git pull operates on one working branch >>>> at a >>>> time (by default), whereas git push uploads and fast-forwards all >>>> the common branches (by default). I want git pull to work like git >>>> push. >>> >>> git push is opposite (almost) to git fetch, not to git pull. >> >> Not to an end user that has no idea or desire to learn about git >> remotes >> or anything else. > > At some point you _have_ to expect your users to learn something. > In the > git documentation, we never pretend that pull is anything else than > "fetch > + merge". > > So this assumption of your end user is a lack of training, really. I typically describe in detail every step they need to get there work done. I expect that a few, simple commands that can be used per copy & paste should solve 90% of the cases. Some users will learn more, some will refuse to learn more. Users from the second group will typically consult a more experienced user if they hit a problem. At at that point they are forced to learn. I don't expect that all users know all details and the users expect that their daily workflow is well supported with a few commands. Steffen