[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging branch to HEAD when branch contains partly trunk changes alr
Re: merging branch to HEAD when branch contains partly trunk changes already
Fri, 8 Jul 2005 23:41:52 +0000 (UTC)
tin/1.6.2-20030910 ("Pabbay") (UNIX) (NetBSD/2.0 (i386))
HK <address@hidden> wrote:
> Suppose the following situation.
> +-1.25.2 .. -- 188.8.131.52 -- 184.108.40.206
> | ^
> | |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 220.127.116.11 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
18.104.22.168" (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