I will give it a shot. I always used the Merge option in Eclipse. But, I'm a little hesitant to do it on someone else's repository. I will give it a shot anyway. I'm sure you can fix it in case if I screw something up :).
Regards, Sai Pullabhotla On Thu, Jan 21, 2010 at 8:15 AM, Niklas Gustavsson <nik...@protocol7.com> wrote: > On Thu, Jan 21, 2010 at 3:02 PM, Sai Pullabhotla > <sai.pullabho...@jmethods.com> wrote: >> Sure, not a problem. Is it okay if I check it into trunk? Would you be >> able to merge it into appropriate branches? Or would you rather prefer >> patch attached to the JIRA issue? > > Give it a try to get it into both branches. Here's how I do it: > * Develop the solution in trunk > * Extract a patch (Team -> Create patch if you use Eclipse) > * Review this so I only get what I really want > * Apply patch in 1.0.x branch > * Test and verify > * Commit to both branches > > /niklas >
