I'm using TortoiseGit on Windows 7/64bit
I got a merge conflict and Resolving gave me the option of choosing THEIRS or MINE. And when I chose MINE, it rolled back to one or two checkins back.
But I'm using it locally. I do have an online repository, which only I use. I did try to PUSH my changes yesterday but it failed (I forget the reason, sorry).
POSSIBLE CAUSES 1. NEW I edit these .html files within a VM but yesterday I edited them from my actual machine. Same file directory and files being edited. Could that make GIT "think" that two different people are editing the files? 2. Could doing a failed PUSH somehow make it appear to to the local Git that my local changes are THEIRS?