3-way git merge and manually picking each difference

Question

Regarding git: I have two branches b1 and b2 with a common ancestor a. Is it possible to merge b1 and b2 in such a way that i see all the diffs of b1 and b2 up until a, indicated with <<< and >>> inside the code so that I can choose for each diff which one I would like to have?

Edit: This question is not primarily about conflict-resolution, but about seeing all the differences between two branches, highlighted inside the code, whether they are conflictual or not. So I can choose which changes I would like to keep. Currently those problematic changes are merged into our development branch without any conflict. During the merge I get two types of files: modified and both modified. The latter I can review and decide to stage. The former are somehow staged without my consent!

eftshift0 · Answer 1 · 2020-07-30T15:53:29.443

2

Set merge.conflictStyle to diff3.

https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging Check the portion related to diff3.

edited Jul 30 '20 at 15:53

answered Jul 30 '20 at 14:26

eftshift0

26,375
3
36
60

Makes sense.... let me add the important stuff to the response. – eftshift0 Jul 30 '20 at 15:50
1

The OP is not asking about conflicts. – matt Jul 30 '20 at 17:02
@matt: thanks! That's right. I'm asking about indicating all the changes between two codes, whether they are conflictual or not. – Marlo Jul 31 '20 at 06:35

3-way git merge and manually picking each difference

1 Answers1