Git Conflict Resolution

Git Conflict Resolution - MERGED MASTER INTO MY GIANT, 10000+ CHANGES BRANCH ONLY 1 CONFLICT! Success Kid

9521 shares

Boss retired gave me a raise before she left

Boss retired gave me a raise before she left

Failed a final So did everyone else

Failed a final So did everyone else

Stereo breaks at work Doesn't have to listen to Christmas music

Stereo breaks at work  Doesn't have to listen to Christmas music

23 years old and still seated at the kids table for thanksgiving... Doesn't have to listen to nutjob relatives argue about politics

23 years old and still seated at the kids table for thanksgiving... Doesn't have to listen to nutjob relatives argue about politics

took off hoodie didn't flash the whole room

took off hoodie didn't flash the whole room

Goes to opera for 1st time Parents aren't murdered

Goes to opera for 1st time Parents aren't murdered

DROPPED SOAP IN SHOWER caught it before it hit the floor

DROPPED SOAP IN SHOWER caught it before it hit the floor

Walks behind girl with yoga pants For the entire 20 minute walk to class

Walks behind girl with yoga pants For the entire 20 minute walk to class

Spilled coffee on my pants Wore coffee-colored pants today

Spilled coffee on my pants Wore coffee-colored pants today

Gets dumped by girlfriend In same month that Assassin's creed 3, Halo 4 and Black Ops 2 come out

Gets dumped by girlfriend In same month that Assassin's creed 3, Halo 4 and Black Ops 2 come out
Like us and Laugh More!

Laugh more daily

Like us on Facebook?