mvhub-dev team mailing list archive

[Dan MacNeil <dan@xxxxxxxxxx>]

Review: Approve
It looks like there are some merge conflicts

Sorry, if you were trying to tell me this when I talked and I didn't understand.

You need to merge trunk into your branch, resolve conflicts, commit and push again to launchpad

approximately:
   cdw 
   bzr merge ../trunk
   bzr conflicts                  # list conflicts
   $EDITOR <files that conflict>
   
   bzr help conflicts    # see what else you need to do




 

-- 
https://code.launchpad.net/~kamalavathi/mvhub/search_box_help_text/+merge/25098
Your team MVHub Developers is subscribed to branch lp:mvhub.