I was wondering if there was some standard procedure to resolve conflicting patches?
For example, this from CVS: Module Name:����pcb Committed By:���djdelorie Date:�����������Wed Feb 23 14:05:20 UTC 2005 Modified Files: ��������pcb/src: global.h main.c print.c Log Message: Allow FAB author name to be set by .Xdefaults conflicts with installing this patch: [ 1112332 ] Print Dialog: Better scale scrollbar & pad/via holes option The later patch knows nothing about the former FabAuthor CVS code and complains about bad FabAuthor initializers. Is there some guide lines for which patches make into the official CVS code?
