Confirmed users
425
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 14:33, 9 September 2014
, 9 September 2014→Merging a pull request
| Line 39: | Line 39: | ||
* Make sure that the commits in the pull request have been appropriately squashed. | * Make sure that the commits in the pull request have been appropriately squashed. | ||
** If they have not been, ask the submitter whether they are comfortable doing so, and offer to help them if they would like to learn. | ** If they have not been, ask the submitter whether they are comfortable doing so, and offer to help them if they would like to learn. | ||
** If the submitter is not comfortable doing the squash themselves, you can do it locally for them via the command line. In this case you would not use the "Merge pull request" button in Github. | ** If the submitter is not comfortable doing the squash themselves, you can [[Web_Testing/Automation/CodeReviewProcess#Squashing_commits_before_merging_a_feature_branch |do it locally for them via the command line]]. In this case you would not use the "Merge pull request" button in Github. | ||
** Note that if the review process was particularly lengthy and resulted in multiple changes it may make sense to keep more than one commit, but in general commits should be squashed. | ** Note that if the review process was particularly lengthy and resulted in multiple changes it may make sense to keep more than one commit, but in general commits should be squashed. | ||