6 ms·

We've got a guy in the office that merges the past over the present all the time. He's not quitting but I imagine if you were to try to break things this would

by yarper 11y ago

We've got a guy in the office that merges the past over the present all the time. He's not quitting but I imagine if you were to try to break things this would be a good way to do it.

wil421 11y ago
Got a offshore guy just like that. Constantly committing his whole project where most files are out of date and only the few he worked on are not. There's no reason for him to commit javascript files he doesn't even work on the front end. It took me forever to figure out he wrote over my files the other day.
- escobar 11y ago
  Sounds to me like he may not actually understand how git works, or he's following bizarre conventions that I've seen before from overseas devs I've worked with to just overwrite the entire project every commit
- cjrp 11y ago
  He must be using push --force in that case.. which seems like a bad practise.
  - yarper 11y ago
    What they're doing is something like branching off a very old version of master, making changes to file A then trying to merge into the latest version of master, which already has a load of changes to file A. They then resolve the conflict by picking "ours", thus ignoring all changes on origin/master in favour of their own old version of master. This doesn't require a --force.
    - cjrp 11y ago
      Oh, that seems even worse!
- Kequc 11y ago
  Sounds like one of those new git conventions that becomes hot every little while. Scripts are written that automate a 10 line git process which along the way gets mangled or copy-pasted wrong and you end up there.
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 ago
  DVCS 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 ago
    You turn this capability off. I did and I sleep much better since!
- shoo 11y ago
  maybe 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 ago
  There is no warning. Pull cp * ../work cd ../work Work (cd ../src && pull) cp * ../src cd ../src Commit
  - jasonlotito 11y ago
    Code reviews people! Proper code review system in place prevents this!
einarfd 11y ago
If he still does that after a stern talking to, you should take his commit privileges.
brianwawok 11y ago
Why are you allowing "force" on the master branch? Don't do that!

by yarper 11y ago

We've got a guy in the office that merges the past over the present all the time. He's not quitting but I imagine if you were to try to break things this would be a good way to do it.

wil421 11y ago

Got a offshore guy just like that. Constantly committing his whole project where most files are out of date and only the few he worked on are not. There's no reason for him to commit javascript files he doesn't even work on the front end. It took me forever to figure out he wrote over my files the other day.

escobar 11y ago
Sounds to me like he may not actually understand how git works, or he's following bizarre conventions that I've seen before from overseas devs I've worked with to just overwrite the entire project every commit
cjrp 11y ago
He must be using push --force in that case.. which seems like a bad practise.
- yarper 11y ago
  What they're doing is something like branching off a very old version of master, making changes to file A then trying to merge into the latest version of master, which already has a load of changes to file A. They then resolve the conflict by picking "ours", thus ignoring all changes on origin/master in favour of their own old version of master. This doesn't require a --force.
  - cjrp 11y ago
    Oh, that seems even worse!
Kequc 11y ago
Sounds like one of those new git conventions that becomes hot every little while. Scripts are written that automate a 10 line git process which along the way gets mangled or copy-pasted wrong and you end up there.

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 ago
DVCS 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 ago
  You turn this capability off. I did and I sleep much better since!
shoo 11y ago
maybe 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 ago
There is no warning. Pull cp * ../work cd ../work Work (cd ../src && pull) cp * ../src cd ../src Commit
- jasonlotito 11y ago
  Code reviews people! Proper code review system in place prevents this!

einarfd 11y ago

If he still does that after a stern talking to, you should take his commit privileges.

brianwawok 11y ago

Why are you allowing "force" on the master branch? Don't do that!