I'm managing a git repo using the integrator work flow. In other words, I pull commits from my co-workers, and push them out to the blessed repo.
I'd like to keep the commit history linear for most cases, so is it OK to do a rebase
instead of a merge
when I integrate changes? Here is an example:
git fetch coworker
git checkout coworker/master
git rebase master
git checkout master
git merge HEAD@{1}
git push
I'm concerned what will happen to the remote repos when they do their next git pull
. Will git be able to handle this, or will the coworker
repo fail during the pull
, now that the commits are in a different order on the origin
?
Update: I originally had the example rebase the 'coworker' branch from 'master'. What I intended was the opposite, to put the 'coworker' commits on top of the master. So I updated the example.