[darcs-users] Re: fixing conflicts in darcs
sam at rfc1149.net
Mon Nov 29 12:13:38 UTC 2004
>>>>> "Erik" == Erik Bågfors <zindar at gmail.com> writes:
Erik> Just to make it real clear, here's an example. I do patch A, B,
Erik> C and D. Then I pull a new version of the remote repo, I then
Erik> get a conflict in patch B (btw, how do I know it's in B?) and I
Erik> have to create a new patch, E to solve B's conflict. I'd like
Erik> to modify B instead.
If your repository has not been pulled from by others, unpull D then
amend B, then pull D again.
Samuel Tardieu -- sam at rfc1149.net -- http://www.rfc1149.net/sam
More information about the darcs-users