Comment 5 for bug 1196473

For future reference the process for merging goes a bit like this:-

# get latest from trunk
bzr branch lp:sudoku-app

# create local branch for fixing
bzr branch sudoku-app fix-bug-1196473

# Fix stuff!
cd fix-bug-1196473
# Write awesome code here!

# Commit changes
bzr commit -m "Fix for bug 1196473 by adding some js and other stuff"

# Push changes to your own branch
bzr push lp:fredoust/sudoku-app/fix-bug-1196473

At this point it's pushed into launchpad.

# Link to bug
https://bugs.launchpad.net/sudoku-app/+bug/1196473 -> click "Link a related branch" on the right, it should suggest yours, if not find it via the search for "fix-bug-1196473" you used above.

# Propose for merging
Then go to http://code.launchpad.net/~fredoust/sudoku-app/fix-bug-1196473 (once pushed above) and click the link to create a merge proposal. It should already know this was branched from sudoku-app, so accept the default. You can optionally choose someone to review your merge request. If you don't fill that in, it goes to all members of the team to review. They show up here:- https://code.launchpad.net/sudoku-app/+activereviews