3 ms·
I am curious - wouldn't your Version Control system catch this and warn him that "file xyz has changed since you last checked it out, ..." etc?
by mavelikara 11y ago
I am curious - wouldn't your Version Control system catch this and warn him that "file xyz has changed since you last checked it out, ..." etc?
- praseodym 11y agoDVCS systems like Git and Mercurial will require you to merge, but if you use a GUI VCS frontend it's really easy to choose the "use my local stuff" button. Been there with some university projects groups. (These people also liked the "force push" method of merging.)
- jerven 11y agoYou turn this capability off. I did and I sleep much better since!
- shoo 11y agomaybe it does, then he just hammers the "yeah yeah proceed" option to ignore that and make it hurry up and do the thing he wants it to do
- tedunangst 11y agoThere is no warning. Pull cp * ../work cd ../work Work (cd ../src && pull) cp * ../src cd ../src Commit
- jasonlotito 11y agoCode reviews people! Proper code review system in place prevents this!