In our daily job, we fetch and checkout the master branch before any job starts, work on it or any branch out of it, and run
git pull --rebase origin master
before any
git push
. If there is any conflict, it could be found during
git pull --rebase
. We have a team to do the code review. Before the submit, we always try to press
rebase
, by which gerrit tries to find the proper commit as the new base. If it cannot, we could find the proper one manually. If a conflict occurs and could not be resolved by rebase, the author is asked to update the patchset and solve the conflict. —
ElpieKay 16 secs ago