[darcs-users] Re: How to resolve merge conflicts without GUI?
Mark Stosberg
mark at summersault.com
Wed Jan 26 17:47:55 UTC 2005
On 2005-01-26, Alexey N. Solofnenko <A.Solofnenko at mdl.com> wrote:
> Hello,
>
> There are examples how to use kdiff3 to resolve conflicts. I looked at
> the file with a conflict and I did not see any CVS type comments inside.
> How can I see what was the problem? Is it possible to resolve conflicts
> with just console applications?
Yes. Search for 'v v v' in your code.
You should find that two areas are marked off with the conflicting
codes. Remove the markerse and leave the version in that you want.
Mark
More information about the darcs-users
mailing list