Quote:
Originally Posted by Quintain
Here is the current state of my sourcetree. I don't want to mess up anything with the respository, so any assistance would be appreciated.
I'm able to do a pull without error, but it doesn't seem to be changing anything. The pull option is still enabled and has a "1", and I have two changes to push that error every time I try it.
|
Try right clicking on the top "Origin/master" and select "
Reset current branch to this commit". Then I would select "Hard" to remove all your changes and reset yourself to where Git is.
To be safe you may want to make a backup copy of the folder before you do this just encase you lose anything. Then later you can copy the changes back in.
Hopefully that gets you back to the current version in the repository.