Aww man git is doing my head in lol.
I currently have windows.github.com but it won’t let me commit anything because of conflicts, then it redirects me to the command line tool. I can probably just make a local backup, delete my repo, resync it and then add the new files back in so it allows me to commit (hopefully).
If not then I will do some reading up on github I guess.
I am using: Windows, Wamp, Notepad++
Thanks a lot for all the help netweb, I will be trying to sort this mess out over the next couple of days!