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

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

Re: [Gnu-arch-users] merging use-case


From: Tom Lord
Subject: Re: [Gnu-arch-users] merging use-case
Date: Fri, 25 Jun 2004 11:22:01 -0700 (PDT)

    > From: "Robert Anderson" <address@hidden>

    > My thought here is to tag their latest, star-merge my changes
    > from mainline, fix up the conflicts, commit, then have them
    > star-merge that branch.  I'm just not sure if that leaves their
    > tree in the desired state:  the requirement is that further
    > commits to the mainline should be cleanly star-merge'able into
    > their branch.

    > Sanity check?

That will work most smoothly if, while you're doing that, they aren't
separately merging from your mainline (which sounds like the expected
thing).

-t




reply via email to

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