Frequently, when two unrelated changes occur in consecutive lines, the merge tool considers them as a single conflict. Is it possible to manually split the diff into two, and resolve them separately?
Frequently, when two unrelated changes occur in consecutive lines, the merge tool considers them as a single conflict. Is it possible to manually split the diff into two, and resolve them separately?