So what’s our rule now for merging a PR? Even with a more structured overview of votes in Gerrit, a lot of changes that could have been merged were not.
I use pre-push hook as part of our distributions at sfi.ru, just as an extra warning: https://github.com/sfi-ru/SfiDistr/blob/master/hooks/pre-push
I just stumbled over this one again:
The classic merge vs. rebase conflict which sounds similar to the situation of merging the PR. Hope this helps. Internally in our company, we’re going with the merge approach.
Keep it up!
All the best!
Some new possibilities are coming soon which might be useful for our Github workflow https://github.com/blog/2051-protected-branches-and-required-status-checks