Make All Merges Manual in Git

Question

I need to know how to manually edit every merge. I found answers on here but everything is only when there is a conflict of merging. I implemented these and if there are new files pulled or no direct conflict between the code it will auto merge, which I can't have.

I want to manually OK every new file, line of code, and conflict with the mergetool.

Please help ive been trying to figure this out for more than a week.

Answer 1

If you use the --no-commit flag to git merge, git will execute the merge, but not make a commit of the proposed merge, so you can review it any way you'd like, including git difftool.

If you agree with the merge, do a regular git commit. If not, just work with the commit as usual until you're satisfied.

(By the way, as you've seen, Git will never automatically commit when the merge causes conflicts.)