On Thu, Mar 15, 2018 at 5:25 PM, Лежанкин Иван <[email protected]> wrote: > Hi, > > I have a problem with merging of binary files. When I try to merge default > into my feature-branch the Hg for some reason thinks that some binary files > have conflicts. By default internal:merge3 can't handle binary files, so Hg > leaves them unresolved. > > But the main point is that I never touched those files in my branch! I don't > know why Hg thinks that there may be a conflict. And I want to find it out. > How can I debug the merge, so that I will understand why Hg tries to merge > those files instead of just fast-forward the changes from default branch - > like many other changes to other binary files?
I know of `hg merge --debug` to see debug output to merge but that's not enough in your case. I don't know of debugging part but I have a easy way for you to get out of this. You can resolve conflicts using `hg resolve --tool :merge-local binaryfiles` or `hg resolve --tool :merge-other binaryfiles` depending on which is local and which is other side. For more interesting merge tools like prompting user to ask which side to keep: https://www.mercurial-scm.org/repo/hg/help/merge-tools _______________________________________________ Mercurial mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/mercurial
