4 ms·
Came here to say this, and drop this video[1] as well. It explains the differences between git and darcs/camp using an example editing session with both tools.
by seliopou 13y ago
Came here to say this, and drop this video[1] as well. It explains the differences between git and darcs/camp using an example editing session with both tools.
[1]: http://projects.haskell.org/camp/unique http://projects.haskell.org/camp/unique
- Argorak 13y agoYep. Sadly, camp seems pretty much dead.
- aidenn0 13y agoBut 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.