Bill Lear <rael@xxxxxxxxxx> wrote: > I probably should have thought ahead and made this fix on a branch, > merged it into my master branch and then into my topic branch ... I > think. Yes. That is standard "good practice" with Git. Unfortunately it does require a little planning ahead if the base to start on isn't immediately obvious (you need to think "I want this here, and here, and here.. and compute the merge base"). -- Shawn. - 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