Look up the 'mergetool' settings. You can delegate to any external program.
Also look on https://lore.kernel.org/git/ for any nuances of the settings in certain situations. (e.g. https://lore.kernel.org/git/cover.1560356675.git....@kdbg.org/ for recent improvements about processes) Philip On 24/12/2019 11:33, Yuval Lavi wrote: > hi > > I have my complex XML files that is part of my source, > I want to fully delegate the conflict resolution to external tool > what I need from git is just to mark an XML file that was changed in > two branches as conflicts and to launch my external tool > I do not want git to try and merge the XML file even if it looks trivial > > how can I do that? > > Thanks, > -- > You received this message because you are subscribed to the Google > Groups "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to git-users+unsubscr...@googlegroups.com > <mailto:git-users+unsubscr...@googlegroups.com>. > To view this discussion on the web visit > https://groups.google.com/d/msgid/git-users/5ece520a-a4cb-4154-92ec-70ddde7a0233%40googlegroups.com > <https://groups.google.com/d/msgid/git-users/5ece520a-a4cb-4154-92ec-70ddde7a0233%40googlegroups.com?utm_medium=email&utm_source=footer>. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/1be402ff-a253-7207-5a68-4d7c619d1903%40iee.email.
