Has a merge conflict if you merge your other branch in first. Conflicts are non-trivial (at least for me to fix)
« Back to merge proposal
Has a merge conflict if you merge your other branch in first. Conflicts are non-trivial (at least for me to fix)