Talk:Understanding Darcs/Patch theory and conflicts

Notes from IRC
20:05 kowey: The current version of that stops right about where my understanding does. The merger/conflictor depedns on the othertwo conflicting patches yet cancels them out... somehow. And the patch resolving the conflict is made relative to.... this weird intermediate state that the merger/conflictor creates.

Notepad

 * Key insight about darcs - darcs thinks in a straight line, whereas human think in terms of graph dependencies. The graphs get projected on the line.   Useful for explaining for example, what the third resolution patch depends on. -- Kowey 16:50, 4 March 2006 (UTC)
 * There isn't really any difference between a dependency and a conflict... is there? Seems like a conflict is a just a dependency without nice contexts, but this is a very vague intuition -- Kowey 00:54, 8 March 2006 (UTC)