Web Testing/Automation/CodeReviewProcess: Difference between revisions

Web Testing/Automation/CodeReviewProcess (view source)

166 bytes added , 9 September 2014

no edit summary

Confirmed users

425

edits

@@ Line 29: / Line 29: @@
 ===At then end of the code review===
-Once the pull request has received the required number of positive reviews (usually one or two), you should squash your commits locally if you are able to and then push a new single commit to your fork to replace all of the commits that were created during the review process. If you are not comfortable doing this squash then request that it be done by someone else by leaving a comment on the pull request.
+Once the pull request has received the required number of positive reviews (usually one or two), you should [[QA/Execution/Web_Testing/Automation/CodeReviewProcess#Squashing_commits_before_merging_a_feature_branch |squash your commits locally]] if you are able to and then push a new single commit to your fork to replace all of the commits that were created during the review process. If you are not comfortable doing this squash then request that it be done by someone else by leaving a comment on the pull request.
 == Merging a pull request  ==
@@ Line 48: / Line 48: @@
 * In general, you cannot merge-in your own code/pull requests, but if it has received a positive review from someone else you can merge it yourself on their behalf.
 * Anyone who has tested the patch against all the affected/intended environments (and made sure it's had at least one review)
+== Squashing commits before merging a feature branch ==