Forcing 'git merge' to declare all differences as a merge conflict

Question

In a \'git merge \' I would like any difference, even if not normally a merge conflict, to be considered a merge conflict. Then, with \'git mergetool\' I can see and resolve ea

Answer 1

You may want to try:

git merge --no-commit

Which will make GIT not commit the merge changes. Alternatively if you want it to commit when there are no conflict, but not to lose the source branch, it's no-ff:

git merge --no-ff

Both can be used if necessary.

More info here: Why does git fast-forward merges by default?