From: A.J. Rossini Date: Mon, 19 Feb 2007 14:39:11 GMT Subject: Re: Rebasing a branch that contains merges Message-ID: <1abe3fa90702190639g3e0d6da1xa8086999ca53228@mail.gmail.com> In-Reply-To: <200702191048.24091.andyparkins@gmail.com> On 2/19/07, Andy Parkins wrote: > So - rebase would need some sort of language to tell it which branch to > favour. The more I use git, the more I start thinking that a domain-specific language to describe merges would not be a bad thing. It's so easy (painless, thought-free) to create a complex set of branches that you'd like to rearrange with each other. Of course, perhaps the right solution is to be simpler and old fashioned and cease hyper-multitasking (i.e. shooting myself in the foot). (I'm sharing Andy's assumption that my repo is just mine, not really shared -- add in sharing, or public use, and it gets far more complex, and the language idea might be a good idea, and not just an idea. Darcs has it's theory of patches, though it's not a language). best, -tony blindglobe@gmail.com Muttenz, Switzerland. "Commit early,commit often, and commit in a repository from which we can easily roll-back your mistakes" (AJR, 4Jan05).