On 25 January 2017 at 18:32, Junio C Hamano <gits...@pobox.com> wrote: > I think you should be able to do something like > > $ cat >$HOME/bin/fail-3way <<\EOF > #!/bin/sh > git merge-file "$@" > exit 1 > EOF > $ chmod +x $HOME/bin/fail-3way > $ cat >>$HOME/.gitconfig <<\EOF > [merge "fail"] > name = always fail 3-way merge > driver = $HOME/bin/fail-3way %A %O %B > recursive = text > EOF > $ echo pom.xml merge=fail >>.gitattributes > > to define a custom merge driver whose name is "fail", that runs the > fail-3way program, which runs the bog standard 3-way merge we use > (so that it will do the best-effort textual merge) but always return > with a non-zero status to signal that the result is conflicting and > needs manual resolution.
Thank you, that's an improvement. :-) Unfortunately, it still completes the merge. Is there any way to simply get the >>>>>>>>/<<<<<<<< markers?
