Search Unity

Builds start failing every time after a resolved Merge Conflict

Discussion in 'Unity Build Automation' started by Revolter, Apr 16, 2020.

  1. Revolter

    Revolter

    Joined:
    Mar 15, 2014
    Posts:
    216
    Anytime there's a merge conflict (I guess it shuffles the commits order), the Unity Builds start to fail. One solution is to make a Clean Build, but it's 3x time slower.
    Would it be possible to make caching handle merge conflicts better?