On 06/26/2011 07:03 AM, William Hubbs wrote: > All, > > I checked out a local branch from master earlier today and rebased that > on catalyst_2. Now that branch has over 100 commits, which will be the > combination of everything on catilyst 2 and current master. > > So, how would you suggest we get that branch back out where everyone can > see it? Do you want me to put it back out on master? It won't be a > forced update, because I used rebase instead of merge. > > The only catch is I don't know how broken that will leave master.
That sentence^^^ rings at least warning bells in my ears. I don't know how well you know the code, how easy conflicts were to solve. What may be important is that we have little (if any) test cases and that we get little help from Python and Bash to detect breakage for us. If that transition adds a pile of bugs that we'll find by chance somewhere next year, that would be a problem. Personally I may have chosen a road moving both branches towards each other until their diff resolves to zero and than add a fake merge commit. But that's dry theory - no idea if that would have worked well. Plus I woulnd't make it alone and not in a few days or hours. > What are your thoughts? Please put them on a new branch (not master) while we're not sure ff the resulting commits could or should be the future. Thanks, Sebastian
