• 1. First find a build-version of trunk where the bot is green.
  • 2. Once you find a good build version, find the SVN version and look that up that commit in the git log on gitorius, and
  • 3. Merge in one of the following two ways.
  • 3.1 git merge -Xpatience
  • 3.2 git cherry-pick ..
  • 4. Wait for bots to report the tree green before merging qtwebkit-2.3-staging to qtwebkit-2.3. Also do not update qtwebkit-2.3 more than once