From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Neil Jerram Newsgroups: gmane.lisp.guile.devel Subject: Re: Git workflow overview Date: Sat, 29 Mar 2008 00:56:39 +0000 Message-ID: <871w5uqreg.fsf@ossau.uklinux.net> References: <87ej9vam9h.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1206752227 5669 80.91.229.12 (29 Mar 2008 00:57:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Mar 2008 00:57:07 +0000 (UTC) Cc: guile-devel@gnu.org To: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Mar 29 01:57:38 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JfPO4-0006m1-UP for guile-devel@m.gmane.org; Sat, 29 Mar 2008 01:57:37 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JfPNT-0006HF-GJ for guile-devel@m.gmane.org; Fri, 28 Mar 2008 20:56:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JfPNN-0006H2-TX for guile-devel@gnu.org; Fri, 28 Mar 2008 20:56:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JfPNJ-0006GU-7i for guile-devel@gnu.org; Fri, 28 Mar 2008 20:56:53 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JfPNJ-0006GR-1n for guile-devel@gnu.org; Fri, 28 Mar 2008 20:56:49 -0400 Original-Received: from mail3.uklinux.net ([80.84.72.33]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JfPNE-0003GC-QL; Fri, 28 Mar 2008 20:56:45 -0400 Original-Received: from arudy (host86-145-183-175.range86-145.btcentralplus.com [86.145.183.175]) by mail3.uklinux.net (Postfix) with ESMTP id D70C91F66E3; Sat, 29 Mar 2008 00:56:42 +0000 (GMT) Original-Received: from laruns (laruns [192.168.0.10]) by arudy (Postfix) with ESMTP id F3B7F3800D; Sat, 29 Mar 2008 00:56:41 +0000 (GMT) In-Reply-To: <87ej9vam9h.fsf@gnu.org> (Ludovic =?iso-8859-1?Q?Court=E8s's?= message of "Thu, 27 Mar 2008 22:29:46 +0100") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7117 Archived-At: ludo@gnu.org (Ludovic Court=E8s) writes: > Hi, > > Just to clarify things, the following illustrates the typical Git > workflow. Thanks, this has been very useful; and thanks also for getting the Git repository up and running! Now, what am I doing wrong here? I've created a load of new .gitignore files, and tried to push them to Savannah's master and 1.8.x branches. The push to master looks good, but the push to 1.8.x does nothing: (We start off on my 1.8.x, whose remote is Savannah's branch_release-1-8. I've created and added all the new files, and committed them to my local 1.8.x. Then...) neil@arudy:~/Organized/SW/Guile/guile-git$ git pull Already up-to-date. neil@arudy:~/Organized/SW/Guile/guile-git$ git push Everything up-to-date neil@arudy:~/Organized/SW/Guile/guile-git$ git checkout -b master git checkout: branch master already exists (At this point I did "git checkout master" in another window, so now we're moving to my local master.) neil@arudy:~/Organized/SW/Guile/guile-git$ git pull Already up-to-date. neil@arudy:~/Organized/SW/Guile/guile-git$ git cherry-pick 1.8.x Auto-merged .gitignore CONFLICT (add/add): Merge conflict in .gitignore Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm ' and com= mit the result. When commiting, use the option '-c fbab080' to retain authorship and messag= e. (...Edited .gitignore to resolve the conflict...) neil@arudy:~/Organized/SW/Guile/guile-git$ git push Counting objects: 82, done. Compressing objects: 100% (42/42), done. Writing objects: 100% (47/47), 6.42 KiB, done. Total 47 (delta 31), reused 0 (delta 0) To ssh://ossau@git.sv.gnu.org/srv/git/guile.git f2060a5..b0ea37d master -> master (Now I try switching back to 1.8.x, to see if it might have changed its mind...) neil@arudy:~/Organized/SW/Guile/guile-git$ git checkout 1.8.x Switched to branch "1.8.x" neil@arudy:~/Organized/SW/Guile/guile-git$ git push Everything up-to-date (It hasn't.) Yours waiting for enlightenment....! Neil