Yes, it's possible to configure WinMerge in a way that it will notify you if there are remaining conflicts when you close it, but it's not a built-in feature of WinMerge itself. The strategy here is to add some script in Git configuration that checks whether the merge made by WinMerge is indeed successful.
Here is a simple approach to achieve this:
- Use a custom script as your mergetool that calls WinMerge and then checks for remaining conflict markers (
<<<<<<<
, =======
, >>>>>>>
) in the file.
Create a file named winmerge-with-conflict-check.sh
with the following content: