Changes between Version 6 and Version 7 of QtWebKitGitInstructions

Timestamp:

Dec 9, 2008, 8:42:48 AM (16 years ago)

Author:

Simon Hausmann

Comment:

--

QtWebKitGitInstructions

@@ -36 +36 @@
 {{{
 git fetch
-git merge origin/svn/master
+git rebase origin/svn/master
 }}}
  * When you are happy with your changes and they have been merged into the {{{svn/master}}} branch you can delete your branch on the public repository using {{{git push origin :simon/crash-fix}}}
  * After deleting the branch on the public repository you can also delete it locally:
-   * Switch to a different branch, such as {{{qtwebkit-4.5}}}: {{{git checkout qtwebkit-4.5}}}
+   * Switch to a different branch, such as {{{master}}}: {{{git checkout master}}}
    * Delete the branch: {{{git branch -D simon/crash-fix}}}