Juergen Daubert [2006-11-05 15:09]:
The biggest problem I see is, that after a 'git pull' and local modifications a 'git push' could fail if someone other has modified the "master"-repo on crux.nu in the meantime. The only solution I found is a 'git pull -f' which will undo the local changes.
Just run "git pull", which will merge the origin repo's branch into your current one (generating a "foo merged into bar" commit). Afterwards, just "git push" as usual. These "merge commits" are a bit ugly, and I think I've heard you can get rid of them if you use "git fetch" followed by "git rebase", but I'm not sure on that. I'll look into the latter. Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?