[darcs-users] pull/unpull with conflicts

[Andrei A. Voropaev]

Hello!

We are using older version of darcs (1.0.2). When we did "pull" from some
other repository, this created couple of conflicts. We decided to do
"unpull" of the patch that created conflict, but now we get the message
"darcs failed: Couldn't commute patch past pending". How should we
proceed?

-- 
Minds, like parachutes, function best when open