tegge-classroom / STAT2984-2018

STAT 2984: Statistical Programming I - Spring 2018
1 stars 13 forks source link

Merge Error #25

Open jthough7 opened 6 years ago

jthough7 commented 6 years ago

When pulling from orgin to submit your changes and you get an error that says their is a merge error. You go to the orange dot on the left and right click it, then what?