Web Testing/Automation/CodeReviewProcess: Difference between revisions

Web Testing/Automation/CodeReviewProcess (view source)

28 bytes added , 18 September 2014

Confirmed users

425

edits

@@ Line 62: / Line 62: @@
 Complete the following steps, which should be done from the feature 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:
+* 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|545 × 414 px]]
-This is convenient as Git provides you with some instructions. We want to combine the second and third commit with the first, so in this example we would edit the file to look like this:
+* This is convenient as Git provides you with some instructions. We want to combine the second and third commit with the first, so in this example we would edit the file to look like this:
+[[File:Git-rebase-2.jpg]]