|
|
|
|
|
|
by stouset
29 days ago
|
|
|
That’s almost definitionally what a merge is. A merge conflict means that some automated tool couldn’t figure it out. But all a merge is is a commit with two parents and an accompanying diff that shows the process of combining them. A merge conflict isn’t really in any way special. It just means whatever algorithm was used couldn’t do it unambiguously without human help. |
|
|