From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/73971 Path: news.gmane.org!not-for-mail From: Francis Moreau Newsgroups: gmane.emacs.gnus.general Subject: Re: git newbie errors Date: Tue, 09 Nov 2010 21:19:40 +0100 Message-ID: References: <87fwvaba7v.fsf@dod.no> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1289334034 5526 80.91.229.12 (9 Nov 2010 20:20:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 9 Nov 2010 20:20:34 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M22339@lists.math.uh.edu Tue Nov 09 21:20:30 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PFugA-000132-0U for ding-account@gmane.org; Tue, 09 Nov 2010 21:20:30 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PFufy-0005D1-O7; Tue, 09 Nov 2010 14:20:18 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PFufw-0005Cl-Tj for ding@lists.math.uh.edu; Tue, 09 Nov 2010 14:20:16 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PFufv-0004C0-Im for ding@lists.math.uh.edu; Tue, 09 Nov 2010 14:20:16 -0600 Original-Received: from mail-wy0-f172.google.com ([74.125.82.172]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1PFufu-0005Bp-00 for ; Tue, 09 Nov 2010 21:20:14 +0100 Original-Received: by wyb28 with SMTP id 28so6901614wyb.17 for ; Tue, 09 Nov 2010 12:19:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=cikvnbEjb8Bimt3Y9cEVm7QVeuknk5yJH9zWXVWKNe4=; b=sCIvs50H+6ivA2e8CNxsA9tjF4awHuYYPZmvjsdFc/rs2bB6iwCe/TUMmfGkwoL2Ep y62B/Xz/weKKFo3L6En+5CqvYgezPUexQ7vRfkRpKEige7x5RAJkIjQyH+f5WGf4CjHX WqxMF9zV/qPyr3WxBXZbUS9+Yw28EjmZmM6OI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; b=Ws63o8zPFlwch73XUWMDN8IGgBGzwnHLVNtNLxDPXzhmWqn1p/0eKPrLvpoUeKGC/p FQA/4zEWFhuOCn98Z2grncUjln2yp/1gMvlPoz7OES2RTIKm8FFUsSUisHuvtZN1q3Zt DLgqGxLtqyaCfLqhMfAt9M6O54Mjtvl5lTtI8= Original-Received: by 10.227.127.75 with SMTP id f11mr7314960wbs.69.1289333984141; Tue, 09 Nov 2010 12:19:44 -0800 (PST) Original-Received: from localhost (au213-1-82-235-205-153.fbx.proxad.net [82.235.205.153]) by mx.google.com with ESMTPS id i19sm1458111wbe.23.2010.11.09.12.19.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 09 Nov 2010 12:19:43 -0800 (PST) In-Reply-To: <87fwvaba7v.fsf@dod.no> (Steinar Bang's message of "Tue, 09 Nov 2010 19:52:52 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Spam-Score: -2.0 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:73971 Archived-At: Steinar Bang writes: > I learnt something about git today. We've been running it in a CVS like > fashion, and that is (apparently) not the way. > > What we did was to have one branch in the hub index that our group was > working on, and then we all each had a local branch tracking it, and we > were all working directly on our local tracking branches. > > When we then did "git pull" we got some odd merges done into our local > branches. It was hard to see what had happened and hard to undo. > > I ended up with a fresh git clone, replace the index in the working > directory, and doing a "git reset --hard" today, after a misbegotten > clean up attempt. > > So... what we'll do come tomorrow, is: > - each create a local branch tracking the shared branch on origin > - branch off from this local tracking branch to do work, and commit all > of our work to this branch > - when finished working, switch to the local tracking branch > - pull ff changes from the shared origin branch > - merge in the local work branch into the tracking branch > - handle conflicts > - push > - if the push fails (because someone else have pushed since your pull), > reset --hard your tracking branch, do a new ff pull from origin, do a > merge from the temp branch and try pushing again (repeat as needed) > - when push has completed the work branch can be deleted (git branch -d > will only delete remerged branches) > > This is the recommended CVS-like pattern of git (or so I'm told). But why still using CVS-like pattern with git ? IOW, why not using git as it should be ? -- Francis