Hi all, I'm not really satisfied about the our usage [1] of git. 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. Maybe we can solve this issue by using a special branch at our local boxes in a way like this: git pull origin # update local repo git checkout -b jue 2.2 # create local branch jue from 2.2 ... add/change/commit # do the usual changes in branch jue ... git checkout -f 2.2 # switch back to our main branch git pull origin # update local repo git pull . jue # merge changes from branch jue git push origin # update repo on crux.nu If something goes wrong with the last step we can just do a 'git pull -f' and do the merge again. If everything is fine delete the local branch: git branch -d jue The only drawback I can see so far is the additional commit message in the log about the merge. Sound this reasonable or is there a better way ? Greetings Juergen [1] http://crux.nu/Main/ContribHowTo -- Juergen Daubert | mailto:jue@jue.li Korb, Germany | http://jue.li/crux