Coworker straight up reverted my feature because it was conflicting with his PR... The tests were failing (on his branch after merging master, was working fine on mine and in master) and he couldn’t figure out why they were failing (obviously because he resolved conflicts incorrectly, but I guess he doesn’t understand that?), so he just ends up skipping the tests altogether and undoing my work. I called these out in the PR via comments, and he said he would address that, and confirmed that his PR was removing functionality that we need. Then nothing... He just merges his branch the day before end of sprint and completely erases my changes from the face of the app. What do you guys recommend doing? I don’t want this to reflect poorly on me, even though I had already gone through QA and got all my work approved. Now suddenly my feature doesn’t work. I really hope this is a one time thing and hopefully he will be handling these in a followup PR. I can’t work on a team with this kind of person... I don’t know if it’s laziness or just inability to do the work correctly or what.
Talk to your manager. Based on what you hear decide next steps.
Talk to your manager. Get on a call with your tech lead along with him and resolve it. If your lead is okay with what he’s doing then just let it go. If not, then obviously he’s been warned once, remind him not to do it again. Merge conflicts happen, and would need to be resolved. Ideally, both of you should pull from master few times a day and resolve small conflicts before they become big. Smaller pull requests are best, that allows for smaller conflicts. One or both of you didn’t pull from master few times.
He went out of scope and combined 4 stories into 1 PR, which ended up being over 1000 lines of changes
Yes that is wrong. Our company policy is 500 lines of change. And people complain even for that.
During standup "Merged my changes in but I saw they were reverted. What was the reason?" They'll have to speak up.
The guy doesn’t even attend standup, he tried resolving the conflicts on Outlook but just cancelled the series
Tech Industry
Yesterday
1957
The end of Backdoor Roth?!
India
Yesterday
825
Modi is a legend, will be remembered for centuries to come
Working Parents
Yesterday
751
What do you think is wrong with a kid who got rejected by 9 colleges?
Tech Industry
8h
614
Offshoring tech jobs is going to benefit the US
Tech Industry
Yesterday
2454
Quitting this Slave life
Raise it to you manager. Send them a Slack first thing tomorrow and ask to chat. As a manager this is something I would want to be aware of and be able to address with the other employee. As you point out, this is the kind of behavior that will drive people off the team so the manager needs to know so they can address it. I almost always coach engineers to work it out between them but this is one case where I would absolutely get involved. It’s not realistic for you to handle this on your own.