Date: Mon, 1 Sep 2014 16:17:53 +0200 From: Andreas Schwarz <freebsd.asc@strcmp.org> To: TooMeeK Admin <maps@toomeek.waw.pl> Cc: freebsd-arm@freebsd.org Subject: Re: U-boot for Banana Pi Message-ID: <20140901161753.042f46918777774d313272b0@strcmp.org> In-Reply-To: <54036970.9040503@toomeek.waw.pl> References: <53EE0F93.6060407@toomeek.waw.pl> <53EE23B1.2020403@toomeek.waw.pl> <CAGtf9xNTsQg-WKMu%2BRqNmF3W=vKm8ccvNdcL1VKm9gWwRohsTw@mail.gmail.com> <53EE402D.8000204@toomeek.waw.pl> <20140815214416.GJ60808@cicely7.cicely.de> <53EFCD6C.5000601@toomeek.waw.pl> <53EFD5D5.7010406@toomeek.waw.pl> <53F0E640.5030506@toomeek.waw.pl> <53F14BD7.1050007@fukaumi.org> <53F1A126.1020408@toomeek.waw.pl> <53F1D8FD.9010903@fukaumi.org> <53F27EB9.3090805@toomeek.waw.pl> <CAGtf9xNw8EAakGLpYL%2Bxi20QdOYZQMg=_A-QtriU5kqY2jLBUA@mail.gmail.com> <54031BC8.8020407@toomeek.waw.pl> <540348DD.3090406@toomeek.waw.pl> <20140831181954.499135cfbffb3266d7ce69ab@schwarzes.net> <54036970.9040503@toomeek.waw.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 31 Aug 2014 20:29:04 +0200 TooMeeK Admin <maps@toomeek.waw.pl> wrote: > Thanks, > > I didn't used this tool before. How to resolve conflicts? > .... > Tree conflict on '/usr/src/COPYRIGHT' > > local file unversioned, incoming file add upon update > Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: h > > (r) - accept current working copy state > (p) - resolve the conflict later [postpone] > (q) - postpone all remaining conflicts > (h) - show this help (also '?') > > Should I type "r" here? > If yes, then I still have obsolete versions, example: > /usr/src/sys/boot/fdt/dts/cubieboard2.dts > doesn't match: > http://svn.freebsd.org/base/head/sys/boot/fdt/dts/arm/cubieboard2.dts I've not expected that you have already an existing copy in /usr/src (probably the 10 release). To avoid problems, please do the checkout and update in a clean dir and then add your modifications. -- best regards Andreas
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140901161753.042f46918777774d313272b0>