Fucking fuck fuck fucker fucking fuck

What a dumbass guy seriously. I have this colleague in my office who refuses to create a new branch because that will "ruin the single straight line". Are you seriously fucking kidding me??? The noobest guy ever doesnt know a third git command other than pulling and committing fucking nonsense. Why use git then? Just go back to creating zip files are maintain code. Fuck that guy too who hired him and now because of this fucking asshole I am not able to carry on my work.

Such so-called "developers" should be strapped to the back of a horse and the horse made to run on a gravel road for fuck's sake.. Fuck you man 🖕

@AlexDeLarge why though??

@bitsnpieces because he's a retard that inundates slurs at pretty much nothing at all. You have reason. He is his own reason. And now he's dragging me around.

Now that I explained this, I gotta mention that you should create instead 4 branches, from each other, just to put him off.

Better visualization software is required, not this.

@AndSoWeCode visualisation is on point. His argument he doesnt want to ruin the "straight single line". What kind of argument is that.??

And its one thing to not know things but downright denying to learn new things is what pisses me off.

Real programmers push to master

What if he will become your boss or a senior developer to you? XD

Does he have OCD? <- the straight line guy

@Dimmerworld B.Tech in Information Technology from an average institute.

@fist22 Will change company before that happens. Not able to tolerate him as a colleague, god forbid as my senior.

@JKyll more of incompetence and unwillingness to learn than ocd.

Maybe you could explain to him why his understanding of git (and likely VCS in general) is completely fucked. Just because he doesn't know VCS doesn't make him incompetent though. Is significantly older than you? Maybe that doesn't even explain it, but comes down to if he's willing to learn. ask your boss if he wants you to train him on VCS usage so it's on the record that he didn't know, then see what else he knows. If he continues to need coddling and you handle it this way the management will be aware of his subpar qualifications and the problem will resolve (unless management is also fucked). But another scenario could arise where he just learns to use git, turns out to an asset to the team and you guys laugh about this down the road...

Hung, drawn & quatered?

I assume he wouldn't be familiar with the simple act of rebasing before merge?

Rebase and merge

If he has no authority over it, then don't worry about appeasing him and his straight line fetish. Tell him to be weird with his own repo.

@snaz there is nothing in the master branch, all work happens in another branch called "mainline" and that is where everyone commits. Its been 2 months for me in this company and I am the one forking branches and commiting my work.

@agaskins Its a very small scale startup so no management as such. We are just a bunch of 5-6 tech people working together. And the main tech guy, he is more into algorithms and machine learning so he rarely gets into the development part. And coming to this noob, he is the same age as I am but since he joined the company before me, he feels he is my senior and obviously knows more than me hence the superiority complex. I offered to explain it to him how git works, why do we actually use git but his attitude is still the same.

And the greatest thing about this is, nobody creates a local branch also. All the work is committed only after it is tested on the release environment. 😑🔫

@lunorian I did that already. In my 2 months, I have already made his straight line into a spider's web.

But the thing is he wants to hide his lack of git knowledge under his straight line obsession. He doesnt give a rat's ass about the straight line, he doesnt know how to fork and doesnt want to accept it.

@snaz There is a default master branch because git already makes one for each repo. But there is only an empty README.md file in it nothing else. All the code is in mainline and everyone pulls from it and pushes in the same branch directly. So yeah, mainline is the effective master and that is where everyone commits.

@AlexDeLarge Exactly, its an attitude problem. And to top his superiority complex, the ceo gives too much importance to him which makes him bloat even more. Consider himself the god and us as mere mortals and without him, the company wont last a day.

Bloody delusional prick.

@buried @dwardu Rebase I guess he is familiar because git at least doesnt let you push unless your local head is in sync. But merge, I dont think so.

@pacohojaverde The repo that I am working on has a dependency on the repo that he is working on, and unless he fixes the issues in his repo, my code wont even compile.

And the changes in his repo cant be committed since they are not tested, so this entire scenario came up where I asked him to commit his untested changes into another branch and fix the issues in the main branch first so that I can resume my work.

Rebase and merge with --ff-only. That'll keep the straight line, since it doesn't create a merge commit.

@bitsnpieces I doubt he's familiar with rebasing if his reasoning for not branching out is that he wants a straight line. Rebasing "mainline" into your branch before merging will literally do that for you, causing the final merge to fast forward. It's what I tend to do to keep my history clean.

Also, having a "mainline" branch instead of just using master is one of the dumbest things I've heard of in a git flow lol.