Option to not trigger a resolve after merge

dukeofgaming dukeofgaming at gmail.com
Fri Nov 9 09:38:01 CST 2012


Hi,

Sometimes I already know what files are going to have conflicts and what
side of the merge I will want to try to keep. If for some reason I get
conflicts with binary files (say, images) and there are 100 conflicts, what
I would like to see is something like:

hg merge -R

Where -R will mean: Don't try to resolve conflicts.

So then I can do something like

hg resolve --list|grep '^U.*\.jpg$'

To see all unresolved jpg images and then mark those and resolve.. without
having to tell mercurial to select the "local" or "other" one by one.

I'm using mercurial with perfarce, and I'm running to often with this
situation with binary file conflicts.

Regards,

David
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121109/dff96d84/attachment.html>


More information about the Mercurial-devel mailing list