Will do.
Is there a command which can ease this? I'm admittedly a bit of a bzr newb.
Could I do something like "bzr merge lp:<whatever the new branch is>" and then simply resolve any conflicts?
« Back to merge proposal
Will do.
Is there a command which can ease this? I'm admittedly a bit of a bzr newb.
Could I do something like "bzr merge lp:<whatever the new branch is>" and then simply resolve any conflicts?