Hi Justin, > While I'm on the subject, I have a few commits that I would like to > send to you. Unfortunately they are currently mixed in on a branch > that I have been doing heavy customization to. What do you think is > the best way to handle this? I'm thinking that once I identify the > commits that should go upstream, I can cherry-pick them into a new > branch and then send you a pull request. >
Yeah, this would be helpful ... it's very hard for me to merge commits that are mixed up with other customizations. For the record; you should rarely be touching the CE plugin code (unless you're doing a bugfix or feature addition that is intended to go back into core). Your local application customizations should be done in your app directory, not directly to CE. Thanks! Bruno > > Justin > > -- > > You received this message because you are subscribed to the Google Groups > "CommunityEngine" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]<communityengine%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/communityengine?hl=en. > > > -- You received this message because you are subscribed to the Google Groups "CommunityEngine" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/communityengine?hl=en.
