Git – how to force merge conflict and manual merge on selected file
Option 5, a custom merge driver, is probably the way to get closest to what you want. It is surprisingly easy to do. Below is an example of one that I think should get you pretty close to the behavior you desire. First, create a merge driver script called merge-and-verify-driver. Make it executable and put … Read more