search

nlottig94 / EmilyDickinson16

Emily Dickinson Fascicle 16 Project
2 stars 3 forks source link

Merge Conflict #23

Closed brookestewart closed 8 years ago

brookestewart commented 8 years ago

I went to sync Github before I started working and it said there was a merge conflict. I'm not sure what to do, but I know I don't want to mess anything up! This is what it looks like: merge

alexthattalks commented 8 years ago

Uncheck the box next to the file that has the conflict, then you should be able to commit the other changes.

Then, with the file you changed, we can fix it tomorrow in class. Just don't commit that one file.