I'm trying to learn how to use git in VSTS (have the right structure to my project from the start). The "beginner" guides are absolutely woeful. e.g. the "beginner's" guide to VSTS, assumes you are merely new to VSTS, and know how to use git, which I don't (the same is true of many "Beginner" guides - "beginner" doesn't seem to mean what it used to :-( ). This is in Visual Studio on Windows 10 - a desktop and a laptop (so I can work on either machine once I sort out how this all works).
I seemed to be making progress, but in trying to get everything synced up on every machine I seem to now be in a Catch-22. Several times it said I couldn't do what I was trying to do because I had uncommitted changes. I hadn't actually changed anything(!), but I did as it requested (made a commit even though I hadn't changed anything). Now I have commits from both machines, and neither will progress. i.e. when I try to pull/push changes, it won't let me - this is in both directions (won't let me push the local changes, nor pull the remote ones).
So, it's saying that if I pull the commits, it will change one of my local files, which I'm ok with, but that's it. I can't see how to make it actually do that. i.e. go ahead and change that file and allow the pull to happen. How do I get out of this mess, short of starting from scratch all over again? (which I considered, but I want to learn how to fix this in case it ever happens again when I have actual changes at stake)