Git & Type Design: How to resolve Git Merge conflicts in UFOs
Git Merge Conflicts happen if two collaborators edit the "same line" of code. Due to the structure of UFO fonts, this can happen a lot. But let’s zoom out a bit...
Git is an awesome tool for type design, allowing both versioned “back ups” and powerful team collaboration abilities. But, if you’re just getting started with using Git to collaborate on UFO font sources, you might run into tHe DrEaDeD mErGe CoNfLiCt, which is can be seriously confusing when you first encounter it. Luckily, most merge conflicts in UFOs are actually super easy to resolve. Here’s one walkthrough of resolving a typical merge conflict, along with an explanation of other scenarios and how to deal with them.
Disclaimer: the merge conflict in this video isn’t actually the best example, because it was actually a fair bit simpler than many I’ve faced in the past. I will try to remake this video next time a thornier merge conflict appears!
00:00 Intro: Why use Git?
02:00 The fonts!
03:10 The GitHub Pull Request
04:16 Getting into the Merge
06:54 Viewing a Merge conflict in VS Code
08:26 A closer look at Git conflict syntax
09:40 The good news: most conflicts are simple!
10:53 Resolving the conflict and making the merge
12:20 Review & Conclusion