Hey guys I was trying to update one of my GitHub repositories but when I did a
git push -f origin master
after pulling had some merging issues and now my updated code is on github that I kept locally but it added txt to my files like
>>>>>>>>>>> Head but not the GitHub files.
I was wondering how you are really supposed to update a repo without pulling from it first because I may keep the code local and if there is a way to get my old repo back on Github because it got rid of the one I started in July and created a new one for August 7th?