Date: Thu, 21 Jun 2001 10:05:45 +1000 (EST) From: =?iso-8859-1?q?Keith=20Spencer?= <bsd2000au@yahoo.com.au> To: Erik Trulsson <ertr1013@student.uu.se> Cc: fbsd <freebsd-questions@FreeBSD.ORG> Subject: Erik you are a gem!->Re: how do I use mergemaster? Message-ID: <20010621000545.67312.qmail@web12002.mail.yahoo.com> In-Reply-To: <20010620072736.A24314@student.uu.se>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Erik/all, You are legend thanks for the help Keith --- Erik Trulsson <ertr1013@student.uu.se> wrote: > On Wed, Jun 20, 2001 at 09:19:47AM +1000, Keith > Spencer wrote: > > Hi Erik and all, > > Thanks for the help. > > Trouble is I have chosen h but what does left > right > > etc mean? How do I know what to do? > > e.g. I have changed > > rc.conf > > do I choose left right what? > > Unclear for me I am afraid. > > Thanks for your patience > > Keith > > It displays the lines in the file that differ > between the file you have > installed and the new file. > The left version is the old one you have installed. > The right version > is the new one. > Which one you choose depends on which you want. > If you have done some modifications to the file then > you probably want > the left side for those parts containging those > modifications. > > You almost alwasy want to update the line containing > the CVS version. > (I.e. choose the version on the right.) > (Usually the first line in the file.) > This is because mergemaster ignores files having the > same CVS id even > if they have different contents. In this way you can > have files with > local modifications without mergemaster asking about > them every time > you upgrade your system. > > > -- > <Insert your favourite quote here.> > Erik Trulsson > ertr1013@student.uu.se > _____________________________________________________________________________ http://messenger.yahoo.com.au - Yahoo! Messenger - Voice chat, mail alerts, stock quotes and favourite news and lots more! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010621000545.67312.qmail>