This project is read-only.

How to do a merge in VisualHG

Aug 22, 2011 at 10:17 AM
Edited Aug 22, 2011 at 10:18 AM

As far as I can tell I can do most tasksrequired for Mercurial inside the VS IDE with VisualHG, except a merge. 

What is the work flow that would initiate a merge?  All I seem to be able to do is pull and update (which just overwrites my changes).  How do I force a merge so I can fix conflicts so I can push back my fixes too.  Obviously I can do this with TortoiseHg repo browser but it doesn't useful that I have to do part of the sync process outside VS.