Tag
1 post tagged #conflicts. Back to all posts →
Resolving merge conflicts in 2D rigs. Step by step, with the gotchas solo devs hit at 2 AM and the fixes that survive the second build.