The Awkward Code

@avazula okay, I'm here :)

Hellooo :)

what's happening?

So, I have two branches: development and release.

okay

before the weekend, all my code for story X was in release, and all was fine. Now coworker has reverted only part of the code... so the initial version of X is still in branch release and in branch development. But the changes I made after testing are reverted, and can now only be found in development.

The problem is that his revert includes more than just my code, so I can't revert his revert because then there'd be code in the release branch that isn't supposed to be there

9:58 AM

oh gosh

I also can't cherry pick my changes from development to release, as I then get the notification that those files can't be cherry picked automatically, probably because of the revert he did :/

why the heck would he do that ...

Would this work :

git rebase -i $commitNumber-1
<Faire les modifs>
git commit --amend
git rebase --continue
git push -f

?

I don't know. I'm mostly trying to fix this using the UI now.

@Ælis the thing is, it's about two branches ... i'm not sure this would work for both branches

10:00 AM

(website, not bash)...

@Tinkeringbell are you familiar with the git bash ?

Yes, I am. I used to use that a lot ;)

@avazula Hum, true :/

Seems like something I would solve by hand ...

Yeah, I've been thinking of doing that too, just copy in the code... but I don't want to get panicky 'there's a merge conflict' emails (which I'm basically expecting should he try to undo that revert).

A J

10:02 AM

Never knew that this room exists.

The whole process here sucks :(

@Tinkeringbell yeah, that doesn't seem right ... I'm sorry that you have to go through this.

He made this process where he doesn't want to 'cherry pick' from one branch to another.

So what he does now is merge development into release, then revert changes :/

@Tinkeringbell I would get mad at this colleague

once release goes into master, he'll undo those reverts apparently, but that already has gone wrong thrice.

10:05 AM

o_o

Yep.

@Tinkeringbell Ouch, doesn't really sound like good practice...

@Ælis I know... so I'm stuck now: do I undo the entire revert and then try to only do a partial revert? Do I manually add my changes to release, and have him handle the merge conflicts once he tries to undo his revert (I could pretend I don't know what he's talking about :P)

At least tomorrow it won't be my problem anymore, but ... I kinda don't like leaving things in a mess...

@Tinkeringbell if you have a really good idea of what he's reverted, I'd go for the first option, and the second one if not

@Tinkeringbell Yeah, I get that :/

10:09 AM

@avazula Well, I can see he did two reverts: One that just has a single story I did in it's entirety (which is good), the other revert contains his code, and mine, 15 files total, two are mine.

@Tinkeringbell ouch ... and I guess you can't let him handle the whole thing?

AARGH. That's about two/three hours of work wasted today, just to figure this out... He's lucky he's on vacation right now or I'd get a second senior dev to take a look and he can go have meetings with management again.

@avazula Nope, he's on vacation this week.

Which is not good either, there was supposed to be some kind of exchange of data/tasks, and I've heard nothing. I'm not going to ask, because if everything is just as well done as this GitLab thing I don't want to know.

@Tinkeringbell I found a couple of answers on SO on how to do partial reverts but it's exclusively bash commands. Do you want me to send them to you?

@avazula Hmmm. Might as well have a look.

so there's this one: stackoverflow.com/questions/5669358/…

10:16 AM

I'll try and see what it does ...

Good luck dear ... Fortunately you won't have to deal with them starting from tomorrow...

@avazula Well actually... I've heard he's been menacing other teams (including the one I'm moving to) a bit as well, luckily those people have been more than capable in keeping him at a distance.

But I might see his face pop in from time to time :)

@Tinkeringbell menacing?? how so?

@avazula Expecting those teams to fix stuff in their processes that his code broke, mainly.

@Tinkeringbell u_u oh lorde ...

10:23 AM

@avazula Ugh. Fails on the first command: commit b062748450da8fc5c04241e207f580ff23cc5ca4 is a merge but no -m option was given. I'm not really trying to undo a commit of course, I'm trying to undo a merge of a revert commit into the release branch. Back to the drawing board .

:(

maybe the merge needs to be reverted before? I don't know ... it seems awful

I can revert the merge, that would basically mean pressing 'revert' in Gitlab, and that makes a new merge request with 1 commit that hold the files that are going to be 'unreverted'. The stupid thing about the UI is that it doesn't allow me to add/remove files from that merge request :/

@Tinkeringbell it'd be a partial merge revert, right?

@avazula Yep, I guess that's the next step.

ugh. I'll look and see if I can find tips online.

10:43 AM

I can't find much on SO... perhaps it's time to put all this shame on that website and ask a question :P

dhein

11:00 AM

@Tinkeringbell Well messes are everywhere, so just focus on the messes you produce, I'd say. And this is clearly not your mess, you are just lifting the carpet where he produced his mess under :P .... Speaking figuratively ^^ Is it an option leaving it untouched and just doing something else today, since its your last day with it?

@Tinkeringbell What was his position again, that no one did escalations already so he gets tamed? 0o

11:35 AM

@dhein Not really an option to do something else, as I want this to go to production tomorrow, so I won't be bothered about it next week :)

@dhein He's a developer, just like me. But he's quite the einzelganger, so there has never been much double-checking of whatever he did. I did stir stuff up a while ago, resulting in me now documenting about everything I do as I still have the feeling he's out to find something to discredit me with :/

Okay, how does this sound?

a.) make a new branch/merge request for reverting the revert, this will contain 1 commit with 15 files.
b.) checkout that branch locally
c.) follow the guidance in the SO post @avazula linked (https://stackoverflow.com/questions/5669358/can-i-do-a-partial-revert-in-git/23401018) and remove the 13 files who's revert I don't want to undo
d.) commit a partial 'unrevert', containing those two files that should never have been reverted to begin with?

Sounds good to me

I'm afraid it'll still give merge conflicts whenever my coworker tries to undo the revert of the other 13 files next week.

@Tinkeringbell sounds like his problem, doesn't it?

sounds like his problem that he'll contact me about :(

I really, really would like to not have that interaction.

11:51 AM

I understand :/ but it could also work :D

And I guess that he'd contact you anyway to try to know why you'd undo his changes ...

I already mailed him about that ;)

Can you just tell him "If you have conflict, just do that"?

Didn't even bother to filter it and remove things like 'you did', 'you didn't' :P

I'm just going to do it, I guess. It's the only option I see right now and I have more stuff to do.

:/

lots of courage dear

Thanks. I need it ;)

12:13 PM

It looks like it worked: My code is now back in the release branch :D

It also looks like this will give a massive merge conflict next time someone tries something, but I'm going to treat that as 'not my problem'.

@Tinkeringbell and you should: Congrats dear

Ugh. So now I have to stop chatting, finish those two internal wiki pages and write another e-mail.

12:27 PM

lots of courage!

dhein

1:00 PM

@Tinkeringbell But if you say he is menacing others aswell and not just you, shouldn't it be quite easy then to get evidence that he is acting quite over the top of his competence? :x

@Tinkeringbell Good girl :P

@dhein Oh, that's quite easy. I already blew stuff up once (at the end of last year, when I wasn't expecting to still be working with him in February ;)). Get another senior dev, and they'll tell him that 'NO YOU DON'T ADD DEAD CODE TO YOUR CODEBASE'

Story here: workplace.stackexchange.com/q/124938/74461

Jasper

Hahaha. The title of this room.