Date: Tue, 21 Jan 2014 09:13:40 -0600 From: Antonio Olivares <olivares14031@gmail.com> To: Ivan Voras <ivoras@freebsd.org> Cc: freebsd-current@freebsd.org Subject: Re: freebsd-update Message-ID: <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com> In-Reply-To: <lblts0$9o1$1@ger.gmane.org> References: <lblts0$9o1$1@ger.gmane.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jan 21, 2014 at 7:49 AM, Ivan Voras <ivoras@freebsd.org> wrote: > Hi, > > Is there any way I can avoid manually resolving hundreds of merge > conflicts of the following type while using freebsd-update ? > > 1 <<<<<<< current version > > > 2 # $FreeBSD: release/9.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z > peter $ > > 3 ======= > > > 4 # $FreeBSD: release/10.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z > peter $ > > 5 >>>>>>> 10.0-RELEASE > > > > ? > > I can't be the only one seeing those...? > Yes, One has to manually go one by one to fix these :( I tried at one point a sed command like sed -i "" '>>>>' to fix these, but it did not work correctly. I see errrors when booting when I don't correct these :( Hopefully someone suggests something better, but yes I do see these as well :( Best Regards, Antonio
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w>