Code review comment for lp:~mitya57/ubuntu/quantal/python-docutils/resync

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

$ bzr init-repo python-docutils
$ cd python-docutils
$ bzr branch lp:ubuntu/python-docutils ubuntu
$ bzr branch lp:debian/python-docutils debian
$ cd debian
$ bzr merge ../ubuntu

Is how I start merges. This has a better chance of not loosing ubuntu changes & making sure it will be possible to merge it back into lp:ubuntu/package without conflicts.

« Back to merge proposal