+1 for making the 1.2 tag the "main show". I'm pretty confident that merging is no longer an option. The code bases have been separate for more than six months and they are very different. Plenty commits from several of us have touched 30 or 40 files at a time.
Dennis Byrne On 4/18/07, Martin Marinschek <[EMAIL PROTECTED]> wrote:
Hi *, this is a formal vote on using the 1.2 branch as current now. Steps in doing this: - branch the current head as 1.1.5_1 - merge down the 1.2 branch to current head (that will be a lot of work, I'll tackle it) my +1 for doing this right now. regards, Martin -- http://www.irian.at Your JSF powerhouse - JSF Consulting, Development and Courses in English and German Professional Support for Apache MyFaces
-- Dennis Byrne