Merge conflicts
... and how to deal with them
Edmundo Carmona Antoranz
October 18, 2020
Book can be downloaded from
here