Adult Content Warning

This work could have adult content. If you continue, you have agreed that you are willing to see such content.

If you accept cookies from our site and you choose "Yes, Continue", you will not be asked again during this session (that is, until you close your browser). If you log in you can store your preference and never be asked again.

  1. 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
    Language:
    English
    Words:
    66,622
    Chapters:
    10/10
    Comments:
    52
    Kudos:
    236
    Bookmarks:
    27
    Hits:
    5,309