News for hackers. Stuff that matters.

A comment on Things to commit just before leaving your job. Parent comment

Re:Things to commit just before leaving your job by wil421 on Wednesday August 19, 2015 @07:54AM (#10084853)
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.

[ Parent | on HN ]
Re:Things to commit just before leaving your job by escobar on Wednesday August 19, 2015 @08:19AM (#10084942)
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
[ Parent | on HN ]
Re:Things to commit just before leaving your job by cjrp on Wednesday August 19, 2015 @08:42AM (#10085026)
He must be using push --force in that case.. which seems like a bad practise.
[ Parent | on HN ]
Re:Things to commit just before leaving your job by yarper on Wednesday August 19, 2015 @11:36AM (#10086220)
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.
[ Parent | on HN ]
Re:Things to commit just before leaving your job by cjrp on Wednesday August 19, 2015 @02:25PM (#10087433)
Oh, that seems even worse!
[ Parent | on HN ]
Re:Things to commit just before leaving your job by Kequc on Wednesday August 19, 2015 @09:16AM (#10085166)
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.
[ Parent | on HN ]