On Sat, 09 Mar 2013 13:06:06 -0800, Tyler Romeo tylerromeo@gmail.com wrote:
- Developers don't understand rebasing - This is not a Gerrit thing.
Rebasing in Git is an essential feature that anybody who uses Git should know how to use, even if on Github. Why? Because git-rebase is the only way to submit a change in a way that it can be merged without conflicts. If you submit a pull request on Github without rebasing first, you're just putting work onto the maintainer to resolve your merge conflicts, possibly resulting in a breakage on master.
False.
git rebase is not the standard or only way of resolving conflicts in a feature branch for review before submission.
As long as you're not using something that properly supports multiple commits being part of a small feature branch (which is basically everything besides Gerrit; GitHub's pull request does support this) the best way to handle conflicts (both during development with other people and before review) is to do a git merge from the branch your code is based on into your feature branch (ie: in most cases a simple `git merge master`). This leaves you with a tip with all conflicts handled that can be easily merged into master.