HK <[EMAIL PROTECTED]> wrote: > Suppose the following situation. > +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 > | ^ > | |merge in > 1.25 -- ... -- 1.27 -- ... -- 1.31
> At 1.25 I created a branch. > Later I merged the changes between 1.25 and 1.27 > into the branch at 1.25.2.2 to have minor updates > of the main trunk also in the branch. > Now I want to merge the branch back into the trunk. If I remember correctly, the correct merge would be "-j 1.27 -j 1.25.2.5" (or the equivalent with instead of hard revision numbers). > I tried a straighforward merge of the > tip of the branch with the tip of the trunk > and get only minor conflicts. Yeah, sometimes that works. Other times I get bogus conflicts with the same text on both sides of the conflict. I just clean those up by hand. -- pa at panix dot com _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
