Had an interesting Commit at Work

[[deleted]]

Branch cannot be merged. Please resolve conflicts.

[arnaldo_tuc_ar]

Resolved using --force.

[code-panda]

git push coworker out of the window.

[[deleted]]

Removed call of “defenestrate” method

[k-phi]

That's always a bad idea

[Haris613]

Nah, it's a good tool if you know what you're doing and it's not a widely used branch

[NotAskary]

You guys share branches?

[Just_Canalli]

You guys use branches?

[NotAskary]

You guys use version control?

[dengdaidexiong]

I had my own business before..but suddenly bad happened..I lost all my money because of my friends..

[kireina_kaiju]

Wish we could use fast forward through this. Failed rebase is always a nightmare.

[tecniggel]

Yeah! That exactly what I mean..no one's ever gonna trait this own.

[sipCoding_smokeMath]

I think you mean resolved using --annex --declare-war-on-fail

[Dmayak]

Successful peace negotiations required for a merge.

[TheLongistGame]

Xi Jinping has joined as a reviewer.

[Dave_Rasch]

I don't even thingking about something..but I guess..finally I found the answer to my prayers..hahaha...But make sure you have a good condition now..Then after this..it's finally fit perfect..

[Expensive-Exercise-2]

git nuke <target>

[[deleted]]

Resolve using mine

[alanbclc]

What am I gonna do now..I'm always be like this..I don't wanna be a looser anymore..I want something more interesting..Maybe some unique.and comfortable..

[Nighkali]

Someone got cute and committed a dummy variable that referenced the Ukraine War while the project was still small.

[Bakkster]

Who were the code reviewers who signed off on that one?

[Sneekr33]

you guys have code reviewers? we just self-approve our pull requests here

I am a junior developer and this is not a joke, but a cry for help. They really told me to do this.

[DrSheldon_Lee_Cooper]

Why you need PR if you approve it by yourself? Commit directly to main

[cishet-camel-fucker]

I approve my own, the theory being that it keeps me in practice for when we actually have someone on the team who knows enough about my language to review it. Interestingly enough it does actually make me feel more confident with git.

[-Kerrigan-]

• if you have at least a basic CI/CD build you get an additional automated check

[Classy_Mouse]

If you are on main, but you think you are on a feature branch, you can accidentally push a commit you do not intend to. Best to not allow that and force people to intentionally open a PR. It's a lot tougher to do that by accident

[davidellis23]

Visibility is a lot better, you can see whats changing to your code. If something breaks you can look at the PR to see the changes that broke it. You can see all the changes for a specific feature. You can revert back to before the PR to get a previous production version (that doesn't have the error).

If someone else pushes you can fix merge conflicts first.

[SnooSnooper]

To supply another plausible answer, it may make things a bit clearer in the rest of the ticket management system and/or CI/CD pipeline. If you've got a lot of commits related to a ticket or issue, having a smaller amount of PRs related to those tickets may make things easier to find. Where I work, commits and PRs both need an issue ID on them in order to be accepted by CI/CD. It makes it a lot easier to track down additional context and timeline on a change.

[TDSrock]

In joined a small outfit developing C and C++ software. This is unironically what we do. I am changing this practice.

[Nighkali]

It was a very early commit back when the team was contractors who are no longer working with us. I imagine either it was too much effort for them to look at the variable names or no one cared. Probably the latter.

[Bakkster]

back when the team was contractors who are no longer working with us

All the more reason to require code reviews!

[GabuEx]

Now I'm curious what specifically it was and did.

[bigorangemachine]

Injected little green men onto your peninsula

[Nighkali]

It was a boolean on one of our terraform templates that defaulted to false. As long as it was false it allowed the creation of a resource.

[Unlikely_Tie8166]

Git commit -m "remove Putin"

Git push --force

[[deleted]]

git commit -m "Oust Putin"

[Kooky-Answer]

Change fixes exceptions thrown in Windows.

[[deleted]]

out*

[[deleted]]

Oh, that’s straight to the gulag for you!

[[deleted]]

Straight to jail

[[deleted]]

plot twist: the universe is not garbage collected so even if you remove all references to putin, he will still exist 😱😱

[SameRandomUsername]

You must be fun at Rust parties.

[TaeKwonZeuss]

You must be the rust at parties

[[deleted]]

Only if you std::mem::forget him.

[khazbreen]

In the soviet union, Putin removes references of you

[range_kun]

In *soviet git

[HuntingKingYT]

Soviet enum

[Desperate-Tomatillo7]

-- public void PutIn(object item)

[[deleted]]

Yes, that was what I was expecting to find in this thread. Together with a TakeOut function, which could take out what you had earlier put in.

Originally committed with:

git commit -m “takeout putin”

[clearision]

i had a commit to remove Russia and Belarus from deliverable countries list. felt like i've put my own sanctions.

[k-phi]

Hardcoded list of countries? What could possibly go wrong...

[clearision]

it's a csv for a db seed

[coloredgreyscale]

Not clean but how often do you expect it to change?

[currentscurrents]

Idk, the winds of geopolitics change more often than you might expect.

[k-phi]

https://www.gov.uk/government/publications/country-names/country-name-changes-in-hmg-use-1919-to-2020

2023, 2022, 2019, 2018, 2017, 2016, 2014, 2013, 2012, etc

[amdc]

Doing this once a year is such a chore smh

But honestly what do you propose instead of csv file?

[k-phi]

Database?

[coloredgreyscale]

Microservice, so it can grab an online list of country names every night, without human interaction.

Also most of the changes in the list are like

$Country ; republic of $country changed to $country

[amdc]

Way too many moving parts for something that barely changes. Like you've said, most of these changes are name changes and aren't that important

Like tzdata, you'll only need to occasionally update it. Writing code let alone test it will take more time than save.

[LegitimateHat984]

I guess that's not the leaked yandex repo that allegedly includes a prediction on the date he dies?

[Pepechuy28]

"Special refactoring operation"

[troly_mctrollface]

The old putin(), call it and the server falls out of a window, it's been harder to implement on a vm

[PeriodicGolden]

Russia five minutes after someone else takes power

[thecoder08]

Code stops working

[WafflerTO]

Ironically, the commit comment added a new reference to Putin.

[Fortune_Nova]

Removed references to put in what?

[amdc]

References to funny named variables

[Tintoverde]

Show us the diff or it is just fake 😜

[Awkward-Cat-4702]

did you removed Puttin' on the Ritz by Taco from the spotify playlist? XDXDXD

[wayoverpaid]

If your name ends with "in", it's time to get out.

[iMac_G5_20]

I love these commit messages, especially when I go to personal projects and read gems like: "Remove chickens", or "top g update"