Fixing your merge conflicts is not a spectator sport. Go get me a latté or something?

flag as inappropriate

Create your own!
      Fixing your merge conflicts is not a spectator sport. Go get me a latté or something?