Adult Content Warning
This work could have adult content. If you continue, you have agreed that you are willing to see such content.
-
Tags
Summary
Often, solving a merge conflict is as simple as knowing and choosing the leading change. Sometimes, it requires more work. Dinesh Chugtai and Bertram Gilfoyle had different views and tools to deal with merging error.
Series
- Part 1 of Conflict and Resolution