As for the first question,
git log --left-right --graph --cherry-pick --oneline B...A
to get a list of different commits between the branches.
After merging one branch with the other git will automatically keep only one copy of duplicate commits. In any case if any conflict, git will ask you to resolve it manually.