> This was, to us, an unexpected result. Given all the commentary and folklore surrounding the merge problem and how difficult it is said to be to resolve merge

> This was, to us, an unexpected result. Given all the commentary and folklore surrounding the merge problem and how difficult it is said to be to resolve merge conflicts…we had expected new code (NC) to be the most common choice. Is this really particularly surprising? I've almost never written new code to solve a merge conflict. Merge conflicts are hard to resolve because they require making complex decisions, not because they require writing code.