P2D2:: BinaryFiles : Select local/remote change

Create issue
Issue #180 open
sassoflash created an issue

We work with a lot of binary files (fla/swf/img), so it occasionally happens that there's a conflict on a merge. Command line Mercurial lets you choose which file to keep, the local or the remote.

In MagHg, I do get notified after the merge that there was a conflict that it wasn't able to resolve. However, it already went ahead and made the choice for me, keeping either one of the files. This potentially overwrites the wrong file and I have to pull the file from a backup.

As an enhancement in a future update, it would be great to have MagHg prompt for the local/remote file selection, so the right file could be kept.


Comments (3)

  1. haruspex

    Just ran into this issue as well today. It's bad practice to force keep local and not prompt for keep local or take other. The decision seems to be happening here: https://bitbucket.org/jfh/machg/src/af0547b2128d/LocalMercurial/mercurial/filemerge.py

    It would be nice to receive a prompt and be given a choice either per file or for all for a given update/merge. It could work similarly to the Copy command in Finder with a "Keep Local" and "Take Other" option, and an "Apply to All" checkbox.

  2. Log in to comment