Git pull --rebase until it hurts

Re:Git pull --rebase until it hurts by seliopou on Tuesday April 30, 2013 @09:27AM (#5632016)

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

[ Parent | on HN ]

Re:Git pull --rebase until it hurts by aidenn0 on Tuesday April 30, 2013 @12:38PM (#5633239)

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.

[ Parent | on HN ]

Re:Git pull --rebase until it hurts by Argorak on Tuesday April 30, 2013 @10:05AM (#5632246)

Yep. Sadly, camp seems pretty much dead.

[ Parent | on HN ]