Hi Bowmore,
Do the following:
bzr merge lp:unity // fix conflicts bzr resolve bzr commit -m "Merge trunk, resolved conflicts." bzr push # It should remember the previous location
The diff here will automatically update.
« Back to merge proposal
Hi Bowmore,
Do the following:
bzr merge lp:unity
// fix conflicts
bzr resolve
bzr commit -m "Merge trunk, resolved conflicts."
bzr push # It should remember the previous location
The diff here will automatically update.