> Sorry, I have no idea how to use any of the GUI tools. Perhaps your > GUI tool has a mailing list where you can ask about merge conflict > resolution? No problem, I actually got it all figured out now, and got my branch smoothly merged back into master. Thanks for your help! Ron -- 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