Git "manual merge" strategy

Question

I have two branches in which the project is working at both tips.

I merge Branch A into Branch B (git checkout BranchB; git merge BranchA), resolve conflicts, and test Branch B to find that it no longer works.

I'm pretty sure the problem is being caused by just one or two commits from Branch A that git is prioritizing above Branch B. Therefore, I'm looking for a way to merge in which "auto-merges" don't take place, so that I can bring to bear a fine degree of control over how conflict resolution takes place. Is this possible?

Answer 1

I'm not sure about skipping merging all together, but you can use

git merge --no-commit

This will allow you to perform the merge, then inspect the merged files before they're committed.