Changes between Version 6 and Version 7 of QtWebKitGitInstructions


Ignore:
Timestamp:
Dec 9, 2008 8:42:48 AM (14 years ago)
Author:
Simon Hausmann
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • QtWebKitGitInstructions

    v6 v7  
    3636{{{
    3737git fetch
    38 git merge origin/svn/master
     38git rebase origin/svn/master
    3939}}}
    4040 * 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}}}
    4141 * After deleting the branch on the public repository you can also delete it locally:
    42    * Switch to a different branch, such as {{{qtwebkit-4.5}}}: {{{git checkout qtwebkit-4.5}}}
     42   * Switch to a different branch, such as {{{master}}}: {{{git checkout master}}}
    4343   * Delete the branch: {{{git branch -D simon/crash-fix}}}
    4444