My coworker pushed changes to almost all of our ASP.NET pages. However, he did so by pushing only his files, and when asked to merge, he overwrote all of our changes to those pages since he last pulled from the server, which was ages ago. We were three changesets past that overwrite before we noticed things we'd already fixed were gone. Had to revert, which we didn't know how to do, and we didn't know what he changed in his push, because he didn't comment on the changeset. He undid weeks of work, thankfully we only lost a few days worth over we reverted. We're going to have a quick lesson on merging correctly on Monday when we all get back

which vc do you use?

Microsoft Team Foundation Server

Did you have a Dev or integration branch or is the release branch messed up.

I say no committing to origin without a second set of eyes go a while and an explanation of git flow.

I don't know if u are in a bad position or us.
My company has exclusive checkout policy on our TFS and our software manager doesn't believe in branching and merging. Everyone is on latest version all the time. Obviously two people can't work on same file, so have to call the person when you need access. Sometimes people forget to check in file and go home. We don't maintain different versions. Any bug fix to production ends up with more bugs as active development is always happening including an in house framework which is used by all products and it gets updated every single week. Don't believe in unit tests or automated testing. Sometimes manager release straight to production from his dev machine.

@navi oh that sounds horrible. Teams I have been on have not had that trouble because we had local feature branches we merge into local Dev branches prior to pushing to origin Dev. We don't touch the release branch without a code review first. I would be terrified to modify code in other environments.

@georgelynch we don't have any of this.

@georgelynch we aren't using git. There are no branches, just the remote. Three people use it, my coworker, my boss, and I.

@iam13islucky something very bad is going to happen. I would look for the nearest exit sign.

@iam13islucky So, no VC at all... I think @georgelynch is right, might be already too late