I'm a novice when it comes to merging, but what about periodically merging changes from 1.1 core to the 1.2 branch? Maybe once a week or something? Is that a possible solution?
On 8/25/06, Martin Marinschek <[EMAIL PROTECTED]> wrote:
Afaik, we're supposed to work on both branches, with the hope of merging again sometime down the road. I wonder how this will work though, with all the changes that 1.2 will require with regards to JDK1.5. regards, Martin On 8/25/06, Mike Kienenberger <[EMAIL PROTECTED]> wrote: > This is just a quick question before I forget to ask it again.... > > How are those of you who are working on the 1.2 branch keeping the > patches to core1.1 in sync? > > From the commit messages I've seen, the only changes have been to > implement 1.2 specific functionality. > -- http://www.irian.at Your JSF powerhouse - JSF Consulting, Development and Courses in English and German Professional Support for Apache MyFaces
