How to merge to the maximum manually?

Question

git

It happens that you work in some branch B1, which is diverted from B2, and both branches accumulate 10-15 commits before you decide to merge your changes from the parent branch. You merge properly, but in the end it turns out that Git decides that certain changes do not cause a conflict, and does the merge "in the wrong direction", eventually inserting old pieces from your branch on top of new pieces from the parent.

How do you usually deal with this phenomenon? Perhaps there is some kind of merge option, when not only conflicting, but also all other changes are offered for viewing?

Answer 1

B1 let's develop B2 feature
Periodically support B1 in B2, resolve conflicts if any.
It's time to merge, create an intermediate branch B3 from B1.
Merging B2 into B3 with squash. We check all the changes again and create a commit.
Create PR B3 in B1 As a result, we have a beautiful Pull Request with one commit and no conflicts.