gnu-arch-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] following branched branches


From: Dustin Sallings
Subject: [Gnu-arch-users] following branched branches
Date: Sat, 20 Dec 2003 17:55:00 -0800


So, I've got a branch of address@hidden/tla--devo--1.1 that has some changes not present in 1.2, but I would like to follow 1.2 with my changes. Branching my tree and trying to star-merge 1.2 in tells me ``unable to merge unrelated trees.'' I assume I'd get the same the other way around.

        What's the standard procedure for doing such a thing?

The trees don't seem quite so unrelated since they share a common descendant and my branch is a superset of 1.1.

--
SPY                      My girlfriend asked me which one I like better.
pub  1024/3CAE01D5 1994/11/03 Dustin Sallings <address@hidden>
|    Key fingerprint =  87 02 57 08 02 D0 DA D6  C8 0F 3E 65 51 98 D8 BE
L_______________________ I hope the answer won't upset her. ____________





reply via email to

[Prev in Thread] Current Thread [Next in Thread]