I took a clone of gaf.git AGES ago and started working on my slotting mechanism, but in the meantime master has moved along (conflictishly too), so I'm wondering how best to organize my changes. Should I just git-rebase and fix up the conflicts, leaving the intermediate commits in a potentially non-building state, or should do a series of merge commits?
_______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
