Since everything in your master is additive to pieter's, it seems like it would be easiest to start with his and begin merging in your changes a feature at a time.
-dave On Mar 10, 2010, at 6:15 PM, Nathan Kinsinger wrote: > On Mar 9, 2010, at 10:51 PM, Kevin LaCoste wrote: > >> 1. Do you currently have "work in progess" in your master branch? > > No, all my current work is in a new branch based off Pieter's master. There > are still a few features/ideas I would like to pull from that branch but they > all need to be reworked first. > >> 2. Do you think it's stable enough to become the new base for our efforts? >> >> If you believe so then it might be a good starting point for us to focus our >> efforts on. If it's too "messy" as Pieter commented to you or containing >> features that aren't quite complete, then it might be better to start with >> Pieter's fork and generate clean patches of your completed features to merge >> in. > > > My intention has been to create a branch that Pieter would want to include in > the next release. As such it is clean (well, the last bits will be soon) and > all the features are complete. I don't know that I can say whether everything > can be included as is. That would be up to the project leader, which is Dave > now I guess. But since it is based on Pieter's master we can start there and > decided how much of my work to include later. > > > --Nathan > > http://brotherbard.com/ > > > >
