Hi, Many of you who do code reviews have seen this: Someone submits patch set 2 or higher to a change and when you try to see the incremental changes in Gerrit, the web interface includes lots of other, merged-in changes.
Steve Varnau has pointed out a solution to this, and it should make reviewer's lives easier in most cases. Just use the following command to submit patch sets 2 and higher: git review -R The -R option avoids a rebase when you submit, and therefore only your changes show up in the patch set. The process is also documented in the wiki: https://wiki.trafodion.org/wiki/index.php/Contributor_Workflow#Updating_a_Change Note: Using the -R option for the initial review is not recommended, for patch set #1 you will usually want to rebase to the latest version. Gerrit will do a merge when the change gets approved (workflow +1). If at that time it runs into a merge conflict, you will get an email and you will have to resolve conflicts. That can happen with or without the -R option, but using -R might defer the error until after the approval, instead of getting it while submitting a patch set. Still, it's probably easier for everyone that way. Thanks, Hans
-- Mailing list: https://launchpad.net/~trafodion-development Post to : trafodion-development@lists.launchpad.net Unsubscribe : https://launchpad.net/~trafodion-development More help : https://help.launchpad.net/ListHelp
