Posted on January 11, 2012 from Twitterrific

GitHub wants me to resolve conflicts but won\'t tell me what they are!

Twitter username:

@

GitHub wants me to resolve conflicts but won't tell me what they are!