|
|
|
|
|
by mememememememo
84 days ago
|
|
But merging already auto-merges what it can best effort. Conflicts are syntax conflicts not semantic ones. Therefore you could have automerges that conflict in a way that breaks the code. Example would be define a global constant in file X. One commit removes it. Another commit on another branch makes use of it in file Y. OTOH where I get merge conflicts in Git it is usually purely syntax issue that could be solved by a slightly cleverer merge algo. CRDT or semantic merge. |
|