I use git rebase when my team is committing to the same branch (as opposed to a branch per feature) and I'm getting ready to push my local commits to my team's remote branch. When there are no conflicts this avoids a commit like "merged with upstream" and when there are conflicts, the commit that resolves them is right next to my other commits around the same feature.
I use
git rebase
when my team is committing to the same branch (as opposed to a branch per feature) and I'm getting ready to push my local commits to my team's remote branch. When there are no conflicts this avoids a commit like "merged with upstream" and when there are conflicts, the commit that resolves them is right next to my other commits around the same feature.There are a lot of articles that try to explain how it works, this one seems pretty good.