ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Looks like there have been a few changes in trunk since you branched off your tree. Here is how to resolve this:

$ bzr branch lp:~mcintire-evan/ubuntu-terminal-app/disable-paste
$ bzr branch lp:ubuntu-terminal-app trunk
$ cd disable-paste
$ bzr merge ../trunk
$ bzr conflicts                       # should list one conflict
$ nano po/com.ubuntu.terminal.pot
$ # Now resolve the conflict by removing the old date and the lines added by bzr
$ bzr resolve po/com.ubuntu.terminal.pot
$ bzr commit -m "Merge trunk"

That's it. :)

Give it a try. I agree that it can be a bit strange at first. ;)
-- 
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/disable-paste/+merge/283244
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.