Confirmed users
425
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Jump to navigation
Jump to search
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 15:04, 9 September 2014
, 9 September 2014→Using interactive rebase to squash commits
| Line 63: | Line 63: | ||
# Start up an interactive rebase session to squash all of the commits in the feature branch that are not currently in the ''master'' branch: | # Start up an interactive rebase session to squash all of the commits in the feature branch that are not currently in the ''master'' branch: | ||
## <code>git rebase -i master<code> | ## <code>git rebase -i master</code> | ||
# This will pop open a code editor (which ever one is configured to be used with Git) with a file that includes some rebasing instructions. The file will look something like this: | # This will pop open a code editor (which ever one is configured to be used with Git) with a file that includes some rebasing instructions. The file will look something like this: | ||
[[File:Git-rebase-1.jpg|frameless|left]] | |||