Git merge two local branches

Question

I have branch Master, branchA and branchB. Now I\'m working in the branchA and I need to merge branchA with

Answer 1

If you or another dev will not work on branchB further, I think it's better to keep commits in order to make reverts without headaches. So ;

git checkout branchA
git pull --rebase branchB

It's important that branchB shouldn't be used anymore.

For more ; https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/