[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Protux-devel] CVS Merge Conflict
From: |
Luciano Giordana |
Subject: |
Re: [Protux-devel] CVS Merge Conflict |
Date: |
Sat, 19 Oct 2002 00:27:24 -0200 |
User-agent: |
KMail/1.4.3 |
You can just delete this file (Makefile) and re-run ./configure
On Thursday 17 October 2002 09:15 pm, Fabio dos Santos wrote:
> Guys,
>
> I get this error while updating from the CVS. . . . something about a
> merge conflict. . .???
>
> Fabio.
>
> ++++++++++++++++++++++++++
>
> cvs server: Updating src/filters
> RCS file: /cvsroot/protux/protux/src/filters/Makefile,v
> retrieving revision 1.16
> retrieving revision 1.17
> Merging differences between 1.16 and 1.17 into Makefile
> rcsmerge: warning: conflicts during merge
> cvs server: conflicts found in src/filters/Makefile
>
> ++++++++++++++++++++++++++
>
>
>
> _______________________________________________
> Protux-devel mailing list
> address@hidden
> http://mail.nongnu.org/mailman/listinfo/protux-devel