[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Protux-devel] CVS Merge Conflict
|
From: |
Fabio dos Santos |
|
Subject: |
[Protux-devel] CVS Merge Conflict |
|
Date: |
17 Oct 2002 21:15:10 -0200 |
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] CVS Merge Conflict,
Fabio dos Santos <=