U-boot for Banana Pi

[Andreas Schwarz]

On Sun, 31 Aug 2014 20:29:04 +0200
TooMeeK Admin <maps at 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