From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 26 Nov 2009 15:42:42 GMT
Subject: Re: Merge priority
Message-ID: <81b0412b0911260742l4beb2305y87c01dd61d7c2b57@mail.gmail.com>
In-Reply-To: <26ae428a0911260444j45437a92r47d7f2e8b292829e@mail.gmail.com>

On Thu, Nov 26, 2009 at 13:44, Howard Miller <howard@e-learndesign.co.uk> wrote:
> I now want to update all my customer branches with the latest fixes
> and patches. Naively, I would just check out each branch and merge the
> stable branch - job done. However, is it sensible to ask if there is a
> way to say that the stable branch is more important if there are
> conflicts.

No, all branches are equal. Besides, are you sure it is safe to just take
your stable version of the code in a conflict? Maybe the stable code uses
something a customer branch renamed or removed?

You can take a look at rerere, though. It should help resolving repeating
conflicts  by recording a resolution of your choice.