|
|
|
|
|
|
by aidenn0
4794 days ago
|
|
|
But what about changes that depend on each other that don't happen to edit the same line? Neither git nor camp will be able to detect that (since it relies on semantic knowledge of your application). Merge conflicts are places where the VCS can't even be wrong about what to do, not places where it won't be right. |
|
|