On Mon, Nov 28, 2011 at 11:08:33AM -0800, Ron Eggler wrote: > I guess I'd go for renaming DVT to master. > > However, I also played around with merge a little, started a merge (in > Windows GUI) and aborted it but the icon of my directory keeps showing the > ywellow exclemation mark, signing that a merge is going on right now but > going into the directory, all the files are with a geen check mark. What's > going on here? How do I resolve this - I don't wanna mess things up so I > might rather resolve this before moving DVT to master. > 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? Andrew -- 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