[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: gEDA-dev: [PATCH 05/17] Add new function to delete any object.
On Fri, Aug 1, 2008 at 12:14 PM, Peter TB Brett <peter@peter-b.co.uk> wrote:
> On Fri, 1 Aug 2008 12:08:35 +0200, "Bernd Jendrissek"
> <bernd.jendrissek@gmail.com> 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
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev