[EMAIL PROTECTED] (Ludovic Courtès) 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...)
[EMAIL PROTECTED]:~/Organized/SW/Guile/guile-git$ git pull
Already up-to-date.
[EMAIL PROTECTED]:~/Organized/SW/Guile/guile-git$ git push
Everything up-to-date
[EMAIL PROTECTED]:~/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.)
[EMAIL PROTECTED]:~/Organized/SW/Guile/guile-git$ git pull
Already up-to-date.
[EMAIL PROTECTED]:~/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 <paths>' or 'git rm <paths>' and commit
the result.
When commiting, use the option '-c fbab080' to retain authorship and message.
(...Edited .gitignore to resolve the conflict...)
[EMAIL PROTECTED]:~/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://[EMAIL PROTECTED]/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...)
[EMAIL PROTECTED]:~/Organized/SW/Guile/guile-git$ git checkout 1.8.x
Switched to branch "1.8.x"
[EMAIL PROTECTED]:~/Organized/SW/Guile/guile-git$ git push
Everything up-to-date
(It hasn't.)
Yours waiting for enlightenment....!
Neil
