On Fri, Aug 1, 2008 at 12:14 PM, Peter TB Brett <[EMAIL PROTECTED]> wrote: > On Fri, 1 Aug 2008 12:08:35 +0200, "Bernd Jendrissek" > <[EMAIL PROTECTED]> wrote: >> I'm still TRYING (losing hope though) to get this patch into one of my >> branches so as not to get too far out of sync with master. I wish you >> had commented on the thread where the Peters and I were talking about >> putting more knowledge of grips' locations into libgeda. So far it's >> proving to be a big win. > > Rather than cherrypicking, have you tried just doing a merge from master?
Yes, and it's an absolute disaster. Whole pages full of conflicts that just sap what little courage I can find to beat them into submission. With pseudo-cherry-picking (because even then I have to make adaptations) I can at least reduce the problem. _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
