[darcs-devel] [issue533] push/pull conflict conflict.

[Terry Smith]

On Sep 10, 2007, at 13:52 , nathan wilcox wrote:
> When I pull, there are no changes to pull in, but when I push to  
> the same remote repository it complains about conflicts.

You have unrecorded changes in the working directory of the remote  
repository. Either record them or do a "darcs revert" to throw them  
away and then push will work fine.

--Terry