tempus fugit
I blogged a fair bit about darcs some time ago, but since then I’ve not been able to get comfortable with the patch algebra’s approach to dealing with conflicting merges — I think mostly because it doesn’t provide a way for the user to instruct darcs on how to recover from a conflict and continue […]