Skip to content
DevMeme
4685 of 7590
VersionControl Post #5135 · source on Telegram

That moment your pull request wants to merge 26,125 commits into master

Description

The image is a cropped GitHub pull-request banner on a white background. A prominent green button labeled "Merge" sits at the top left, with an unchecked checkbox labeled "Squash commits" and a small info icon beside it. Bold text directly underneath states "26125 commits and 8 merge commit will be added to master." followed by a blue link "Modify merge commit". A faint grey helper line reads "You can merge this merge request manually using the command line". The ridiculous 26 k-commit count lampoons poor branching hygiene, missing rebases, and the terror of hitting merge without squashing, resonating with version-control and code-review veterans

Comments

62
Anonymous ★ Top Pick “26,125 commits into master? Ah, we’re just converting Git history into an event stream and trusting prod to be the consumer that figures it out.”
  1. Anonymous ★ Top Pick

    “26,125 commits into master? Ah, we’re just converting Git history into an event stream and trusting prod to be the consumer that figures it out.”

  2. Anonymous

    After 15 years in the industry, I've learned that the number of commits in a PR is inversely proportional to the developer's understanding of git rebase -i. This looks like someone discovered the 'save' button in their IDE and thought each Ctrl+S deserved its own commit message

  3. Anonymous

    When your feature branch has been open so long that the original author has retired, the tech stack has been rewritten twice, and the product manager who requested it doesn't even work at the company anymore - but hey, at least you remembered to squash those 26,125 commits. Nothing says 'I've been rebasing for three days straight' quite like a merge that could single-handedly crash your CI/CD pipeline and make git blame utterly useless for the next decade

  4. Anonymous

    Squash and merge: Because a pristine master history is worth more than the forensic value of your 47 'WIP: oops' commits

  5. Anonymous

    “Merge 26,125 commits into master” - choose Merge to preserve bisectable archaeology, or Squash to rebrand chaos as a single design decision

  6. Anonymous

    Pressing Merge on 26,125 commits is the fastest way to load‑test your CI, your branching strategy, and your incident response - all in one click

  7. @SergeyKlimchuk 3y

    Reviewerers comment below

  8. @klopotek 3y

    Merge commit of death

  9. @callofvoid0 3y

    wanna commit a suicide ?

    1. @shynekomaid 3y

      I'm was searching your message

      1. @callofvoid0 3y

        Thanks to all the people behind the scenes who inspired me for this comment

        1. @shynekomaid 3y

          I think, github give achievement "YOLO" to reviewer

          1. @AhmedSphere 2y

            Or adding a new achievement "How did we get here?"

  10. @biohazzardt 3y

    А че так мало изменений?

    1. @sylfn 3y

      tr: why so little changed? please use English in this chat

      1. @biohazzardt 3y

        kok

      2. @iolebedev 3y

        Then use English in your profile description too

        1. @viktorrozenko 3y

          I don't feel like it's a fair comment. The rules of this group chat don't apply to her personal account

          1. @iolebedev 3y

            But I'm not necessarily talking about the chat rules on the first place, ok? It is about how you position yourself to the world. If this chat is created and maintained by russians, but they wish it to be fully international and demand only english to be used, then you do expect moderators to go full english too, right? Its weird to demand others to go full english yet having your profile description not translated... Its just not consistent.

            1. @viktorrozenko 3y

              1. It's not fully run by russians. For instance, there's the @RiedleroD, who's Austrian (I think?) 2. My point still stands, admins' identities are not bound by a single chat that they maintain I'm not trying to harass you, just saying 😃

              1. @RiedleroD 3y

                yup, austrian is correct. @iolebedev we've decided this to be an international chat, not a russian chat. Doesn't matter who moderates it

                1. @callofvoid0 3y

                  I claim this group by the rights UN gives me every one kneel down and stay calm so you won't get hurt

            2. @sylfn 3y

              Not "only english" be used, but "this chat sould be accessible to English-only people". This means that a message should be written in a way that delivers the meaning to people why may not speak other languages. For example, this message (I'm not lazy and writing it in english and russian). Profile descriptions are somewhat unrelated to chat --- and the "related" part (pronouns and name) is still in English. And, as said above, not all of the chat mainatiers are russian or know russian language Идея не в том, чтобы использовать *только английский*, а в том, чтобы общаться так, чтобя любой человек, знающий английский могли понять смысл (почти) каждого сообщения. Например это сообщения --- в этот раз я не поленилась и написала его как на английском языке, так и на своем родном. Описания профилей мне кажется не совсем имеют отношение к чату. У меня же нет каких-то нехороших вещей там --- только текст и пара ссылок. Местоимения и имя записаны на английском, есть английский pronouns page. Не вижу проблемы, вот прям никакой. Ну и как уже сказали, не все поддерживатели чата (не смогла найти слова) русские или знают русский язык

              1. @sylfn 3y

                Я надеюсь что я не наплела фигни в переводе и что эти два текста по смвслу более-менее совпадают I hope I translated my message correctly and its meaning is the same as in my head

              2. @callofvoid0 3y

                TL;DR: you can use any languages as long as you provide English translation for what you say 'cause not everyone understands languages other than English

            3. @ZgGPuo8dZef58K6hxxGVj3Z2 3y

              Who the hell cares about the profile stuff? Thats your private choice. Imagine being in multiple languages admin. Aren’t you allowed to be? The group chat is different from your profile. Whats next demand to be english in PMs too?

              1. @RiedleroD 3y

                literally 1984

                1. @sylfn 3y

                  it's 2023

                  1. @RiedleroD 3y

                    damn, since when?

                    1. @sylfn 3y

                      since Jan 1st

                    2. @affirvega 3y

                      wake up Neo ^^ you'we the chosen wan uwu

                2. @dugeru42 3y

                  Russian language is overrated anyway :D

                  1. @mekosko 3y

                    Underrated

                    1. @dugeru42 3y

                      i feel more comfortable using english

                  2. @affirvega 3y

                    it's a solid language, but grammar is overly complex and too much words coming from english slang 7/10

                    1. @affirvega 3y

                      You can do amazing stuff with literature style but i'm stupid

                      1. @dugeru42 3y

                        WHY THE FUCK WOULD YOU NEED 6 FUTURE TIMES AND 6 PAST TIMES is one of my concerns with it

                        1. @affirvega 3y

                          what do you mean 6 future times?

                        2. @sylfn 3y

                          is there really SIX future+past times?? i thought only one...

                          1. @dugeru42 3y

                            depends on how you quantify it

                        3. @mekosko 3y

                          One future, one present and one past times

                          1. @dugeru42 3y

                            one-time|multiple-times|uncertain|continuus|multiple-times-continuous|multiple-times-finished

                            1. @mekosko 3y

                              These are not times

                            2. @sylfn 3y

                              those are what

                        4. @affirvega 3y

                          you don't even know that meaning of a word can dramatically change based on a prefix and it is not consistent with the whole language.

                  3. @RiedleroD 3y

                    I don't speak it, 0/10

                    1. @callofvoid0 3y

                      I don't know it -5/10

                    2. @sylfn 3y

                      time to learn

                      1. @RiedleroD 3y

                        only if you learn upper austrian dialect

                    3. @affirvega 3y

                      сука блять (suka blyat)

                      1. @callofvoid0 3y

                        I know this one

                        1. @sylfn 3y

                          it's two

                      2. @RiedleroD 3y

                        I know these two

                3. @ZgGPuo8dZef58K6hxxGVj3Z2 3y

                  💀😂

  11. @SmirnGreg 3y

    ☑️ Squash commits

    1. @shynekomaid 3y

      Sounds good

  12. @Andrew_Stopchenko 3y

    Epic

  13. @bza_bza 3y

    nothing special, just my daily routine

  14. @shynekomaid 3y

    Literally me

  15. @sylfn 3y

    for some verbs only two are allowed: <Perfect Infinitive> сделать (make done) <Perfect Past/Fem> сделала (made<f> done) <Perfect Present> None <-------- <Perfect Future> сделаю (will make done)

    1. @sylfn 3y

      i dont count verb base form (inf) as 'time'

  16. @derlas_forenly 3y

    Programming languages? No, its about languages, just languages

Use J and K for navigation