Confirmed users
425
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 13:13, 18 September 2014
, 18 September 2014no edit summary
No edit summary |
|||
| Line 58: | Line 58: | ||
You will use git's interactive rebase feature to take all of the commits that are currently in the branch and ''squash'' them into a single commit. | You will use git's interactive rebase feature to take all of the commits that are currently in the branch and ''squash'' them into a single commit. | ||
''Note:'' If all the commits are ones that were added only to the feature branch then you should not run into any issues. If your feature branch includes commits from master that were pulled in during development of the feature, you could encounter conflicts when doing the interactive rebase which you'll need to address. In this case it might be simpler to go with the second option ''merge with --squash''. | ''Note:'' If all the commits are ones that were added only to the feature branch then you should not run into any issues. If your feature branch includes commits from master that were pulled in during development of the feature, you could encounter conflicts when doing the interactive rebase which you'll need to address. In this case it might be simpler to go with the second option [[Web_Testing/Automation/CodeReviewProcess#Using_merge_with_--squash_to_squash_commits |''merge with --squash'']]. | ||
Complete the following steps, which should be done from the feature branch: | Complete the following steps, which should be done from the feature branch: | ||