On Thu, Mar 15, 2012 at 02:43:58PM +0100, Vincent van Ravesteijn wrote: > It's easier to have a separate branch in case the repo has new > commits. If you do 'git pull' with local commits in your tree and > with new commits in the repo, you will get an unnecessary merge.
"git pull --rebase" to the rescue. > If you keep the master branch clean, you can always safely 'git > pull'. Whenever you want to push a feature to the repo, you rebase > it onto, merge it into master and push. If you keep rebasing every now and then (like, always when you pull, see above) your local work and the main repo don't diverge too much and the chance of getting conflicts is smaller then with a big merge in the end. For the "normal" case of working on a single feature at a time that's already completely sufficient. Andre'
