[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Star merging with 3 branches
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] Star merging with 3 branches |
Date: |
Wed, 10 Dec 2003 23:44:42 +1100 |
On Wed, 2003-12-10 at 23:28, Andrew Suffield wrote:
> [Hey, did anybody ever actually write this stuff up properly? We
> hashed it out on IRC, months ago, over the course of a couple of
> evenings, but the "How to handle conflicts" stuff seems to have been
> forgotten]
I put it up on the Wiki, at the IdempotentMerge page - minus a little
detail, but covering the two basic approaches, from which all else
builds.
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
signature.asc
Description: This is a digitally signed message part
- Re: [Gnu-arch-users] Star merging with 3 branches, (continued)
- Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Joshua Haberman, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Robert Collins, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Joshua Haberman, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Robert Collins, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Andrew Suffield, 2003/12/10
- Re: [Gnu-arch-users] Star merging with 3 branches,
Robert Collins <=
- [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Tom Lord, 2003/12/10
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Andrew Suffield, 2003/12/10
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Tom Lord, 2003/12/11
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Andrew Suffield, 2003/12/11
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Tom Lord, 2003/12/11
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Robert Collins, 2003/12/11
Re: [Gnu-arch-users] Star merging with 3 branches, Robert Anderson, 2003/12/09