6 ms·

I’d warn against Gerrit. From the best my team has been able to figure out, Gerrit encourages a development flow that breaks the golden rule of rebase and treat

I’d warn against Gerrit. From the best my team has been able to figure out, Gerrit encourages a development flow that breaks the golden rule of rebase and treats all pushes as force pushes. The result is that in a collaborative environment your changes are occasionally reset by someone else pushing changes. (To my eye Gerrit seems like it was written by people who wanted git to work like svn.)

zwily 9y ago
You can configure Gerrit to cherry-pick, and I believe the default is to do a merge.
khazhou 9y ago
They've set it up wrong. I use Gerrit in a large team and have never seen that problem. Force push is explicitly disabled in our config.