Crony's Dungeon
  • Communities
  • Create Post
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
F04118F@feddit.nl to Programmer Humor@programming.dev · 1 month ago

Merge conflicts

feddit.nl

message-square
54
link
fedilink
649

Merge conflicts

feddit.nl

F04118F@feddit.nl to Programmer Humor@programming.dev · 1 month ago
message-square
54
link
fedilink
  • potoo22@programming.dev
    link
    fedilink
    arrow-up
    66
    ·
    1 month ago

    We have a deployed branch. It doesn’t get merged into master until it gets reviewed… the technical debt got too big so it never gets reviewed and we just keep branching off deployed

    • rainwall@piefed.social
      link
      fedilink
      English
      arrow-up
      62
      ·
      edit-2
      1 month ago

      Yes, we’ve had first master branch, but what about second master branch?

    • The Quuuuuill@slrpnk.net
      link
      fedilink
      English
      arrow-up
      37
      ·
      1 month ago

      jesus

      • SeductiveTortoise@piefed.social
        link
        fedilink
        English
        arrow-up
        28
        ·
        1 month ago

        He can’t help you. Y’all need Linus.

        • TunaLobster@lemmy.world
          link
          fedilink
          arrow-up
          11
          ·
          1 month ago

          What’s he going to do? Drop commits? /s

          • silasmariner@programming.dev
            link
            fedilink
            arrow-up
            8
            ·
            30 days ago

            He drops commits but keeps on forgetting
            What he wrote down, CI goes so loud
            He tags the release but it won’t go out
            E2es choking now, pipeline’ jokin’ now
            Clock’s run out, time’s up, over, blaow.

    • marcos@lemmy.world
      link
      fedilink
      arrow-up
      15
      ·
      1 month ago

      Well, when you said “we have a deployed branch”, you could just have stopped there. All the rest is just what happens after you decide to rename your master branch.

Programmer Humor@programming.dev

programmer_humor@programming.dev

Subscribe from Remote Instance

Create a post
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programmer_humor@programming.dev

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics
Visibility: Public
globe

This community can be federated to other instances and be posted/commented in by their users.

  • 730 users / day
  • 3.08K users / week
  • 8.32K users / month
  • 17.9K users / 6 months
  • 1 local subscriber
  • 26K subscribers
  • 1.54K Posts
  • 47.1K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.11
  • Modlog
  • Legal
  • Instances
  • Docs
  • Code
  • join-lemmy.org