search

RJP43 / CitySlaveGirls

The Restoration of Nell Nelson
http://nelson.newtfire.org
5 stars 4 forks source link

SOLUTION TO THE MERGE CONFLICT ERROR FROM 12/7/15 #19

Closed RJP43 closed 8 years ago

RJP43 commented 8 years ago

FIXING THE MERGE CONFLICT FROM 12/7/15

RJP43 commented 8 years ago

@spadafour @KariWomack @CodyKarch Everybody this is very important. Save any of your articles or website development (CSS) you have been working on over this weekend locally on to your computer then go in and delete your local repository literally right click in your desktop client and in your GitHub local directory and remove/delete. Then go back onto the online version and re-clone the repository. DO NOT SYNC UNTIL YOU HAVE THE REPOSITORY RE-CLONED!!! cloneimage this image shows the button you hit to re-clone.

Thanks