[U-Boot] git merge summary

Wolfgang Denk wd at denx.de
Tue Dec 21 15:36:28 CET 2010


Dear Detlev Zundel,

In message <m2sjxrxm38.fsf at ohwell.denx.de> you wrote:
> 
> > may I ask again for opinions about enabling that feature?
> 
> I also would like to see it.  Wolfgang, is there anything that you
> don't like about this option?

There is two things that make me hesitate:

1) I wonder if it might have negative side effects. If it was
   generally considered a good thing I would expect that it was set
   as default, but it ain't.

2) I don't know what exactly needs to be done.  My understandaning is
   that I can either switch this on globally for all repositories I'm
   working with (which I do not like), or it needs to be set manually
   in each and every clone of the U-Boot repo where a merge might be
   done.

   When I throw away a repo for some reason and start with a new clone,
   I can be pretty sure that I will forget to re-enable this.

   What needs to be done about custodian repos etc.?

In other words, it sounds like a thing that causes effort and can go
wrong nevertheless.

So I'd rather wait until either this option is used as defualt by some
new version of git, or at least until there is a broader request and
consensus among the custodians.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Marriage is like a cage; one sees the birds outside desperate to get
in, and those inside desperate to get out."               - Montaigne


More information about the U-Boot mailing list