Search the Community
Showing results for tags 'automerge'.
Twice since I started my project has changeset been unknowingly set to "0" while in the middle of working. Recently this caused me to lose all of my local changes. When I go to checkin, my changeset appears to be set to zero in my branch explorer, but no files on my computer support this. All files are up to date locally. When I go to checkin it only shows the local files to checkin that are different than my last changeset (22), not the changest 0 that is claims to be on. The first time this happened I merged to a new branch, then synced to the most recent change and then merged my branch in. The most recent time this happen I automerged (everything looked like it should work, I got no errors or requests for conflicts). This merge chose to overwrite ALL my local changes with the old changes and every line of code I wrote is now gone forever. I can't believe this happened and don't understand why an automerge would EVER overwrite local lines of code without warnings? How can I make sure this never happens again? Why is it setting my changeset to 0?