Merge like it's 2099 (AndroidMakers 2017)

Merge like it's 2099 (AndroidMakers 2017)

Every developer working in a team of more than 2 person has experienced conflicts when merging, rebasing or cherry picking a commit. Resolving those conflicts is a tedious task and it's time for a change. This talk will propose a solution to merge smarter and not harder.


Xavier Gouchet

April 10, 2017