Tutorial by Examples

If you want to make a change that you want to merge with master, the best way is to first create a topic branch git checkout -b foo make a single commit with your feature git commit -m "Made the thing X finally work" and push that branch to review via git push origin foo:refs/for/...

Because of how gerrit relies on change-ids, in order to resolve conflicts (pull changes to your topic branch) the best practice is to rebase topic branch onto master/other branch you want to push to. This way you preserve the change-id without having to ammend the merge commit. For example if you su...

As mentioned in the other example, you should use rebase instead of merge. But if you're working on a feature branch with your team then you'll run into the problem of pulling rewritten history. So the best way to work on a feature branch foo is to locally create tracking branch foo that you use onl...