Hi Toralf, On 12/30/12 18:14 , Oliver Bock wrote: > On 12/27/12 15:40 , Toralf Förster wrote: >> Every commit seems to change that file too - therefore I'm wondering >> whether cherry-pick of git commits may more often fail than in other >> projects ? > > Short answer: sure!
Longer answer: the checkin_notes file, by its very nature, will cause merge conflicts and prevent clean cherry-picks - all without any *real* benefits, just falsely perceived ones. Speaking of bad habits, clean cherry-picking won't be possible anyway since most commits simply aren't atomic, they cover more than one topic. So unless developers get over that habit you'll just get the whole fruit salad. But thanks for voicing your concern about that issue. Hopefully we'll reach the critical mass in a not too distant future for this situation to change... Happy new year! Oliver _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
