On Thu, Nov 26, 2009 at 13:44, Howard Miller <howard@xxxxxxxxxxxxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html