[pkgsrc/trunk]: pkgsrc/doc/guide/files Added an FAQ entry for the "Makefile a...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6a412cc6a56
branches:  trunk
changeset: 518811:a6a412cc6a56
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Sep 18 22:27:54 2006 +0000

description:
Added an FAQ entry for the "Makefile appears to contain unresolved
cvs/rcs/??? merge conflicts" error message.

diffstat:

 doc/guide/files/faq.xml |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 90408067b825 -r a6a412cc6a56 doc/guide/files/faq.xml
--- a/doc/guide/files/faq.xml   Mon Sep 18 22:04:52 2006 +0000
+++ b/doc/guide/files/faq.xml   Mon Sep 18 22:27:54 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.29 2006/09/13 23:27:31 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.30 2006/09/18 22:27:54 rillig Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -610,6 +610,22 @@
        </procedure>
 </sect1>
 
+<sect1 id="faq.rcs-conflicts">
+<title>What does <quote>Makefile appears to contain unresolved cvs/rcs/??? merge conflicts</quote> mean?</title>
+
+<para>You have modified a file from pkgsrc, and someone else has
+modified that same file afterwards in the CVS repository. Both changes
+are in the same region of the file, so when you updated pkgsrc, the
+<literal>cvs</literal> command marked the conflicting changes in the
+file. Because of these markers, the file is no longer a valid
+<filename>Makefile</filename>.</para>
+
+<para>Have a look at that file, and if you don't need your local changes
+anymore, you can remove that file and run <command>cvs -q update
+-dP</command> in that directory to download the current version.</para>
+
+</sect1>
+
 <sect1 id="too-much-time">
   <title>I have a little time to kill.  What shall I do?</title>