Git - Automatically Merge

Question

-Initial File Content:

1
2
3

-File Content at Branch A):

1 changed line by A
2
3

-File Content at Branch B):

1
2 changed line by B
3

-File Content i want to achieve at Branch B after merging A into B:

1 changed line by A
2 changed line by B
3

Which merge strategy enables me to achieve this result automatically?

Normal (recursive) merge results in this, and its not solvable automatically:

0 
<<<<<<< HEAD
1 changed line by A
2 
=======
1 
2 changed line by B
>>>>>>> refs/remotes/Remote-B/master
3 

Answer 1

Given the volume of merging done by some projects using git, I think it's safe to assume anything it doesn't do automatically produces bad results too often to tolerate.

Those are in the same change hunk, too close together for git's automerge's taste.