-
Merge like it's 2099
Featuring Xavier Gouchet
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. Xavier will share with you a solution to merge smarter and not harder.
droidconuk android merge -
Introducing the new react-native upgrade
Featuring Nicolas Cuillery
Upgrading can be a pain. But luckily Nicolas Cuillery will be at this month's React London to show us how to make it easier with Git and merge tools!
git react reactive react-native merge merge-tools automatic-merge 3-way-merge
