Civilloquy
  • Communities
  • Create Post
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
somerandomperson@lemmy.dbzer0.com to Programmer Humor@programming.dev · 2 days ago

we did a little bit of branch fuckery

lemmy.dbzer0.com

message-square
20
fedilink
738

we did a little bit of branch fuckery

lemmy.dbzer0.com

somerandomperson@lemmy.dbzer0.com to Programmer Humor@programming.dev · 2 days ago
message-square
20
fedilink
alert-triangle
You must log in or register to comment.
  • CIA_chatbot@lemmy.world
    link
    fedilink
    arrow-up
    120
    ·
    2 days ago

    Ok, well I was looking for a new project - guess I’m making git-ar hero now

    • criss_cross@lemmy.world
      link
      fedilink
      arrow-up
      33
      ·
      2 days ago

      Is the goal to make branch commands that match a specific song? That’s be fun.

      • rtxn@lemmy.world
        link
        fedilink
        arrow-up
        31
        ·
        2 days ago

        Use the guitar controller to branch, commit, and merge to the beat of Through The Fire And Flames and try to get a conflict-free repo.

        • toynbee@lemmy.world
          link
          fedilink
          arrow-up
          7
          ·
          2 days ago

          Presented without comment: https://www.youtube.com/watch?v=wesICmc48UE

          • rtxn@lemmy.world
            link
            fedilink
            arrow-up
            3
            ·
            1 day ago

            Jazz 2.0 just dropped

            • foodandart@lemmy.zip
              link
              fedilink
              arrow-up
              1
              ·
              1 day ago

              Jazz 2.0 just dropped

              LOL!

              That or Progressive Acid Folk.

    • foodandart@lemmy.zip
      link
      fedilink
      arrow-up
      8
      arrow-down
      1
      ·
      2 days ago

      Dad joke for coders? Ooooo… you!

    • naeap@sopuli.xyz
      link
      fedilink
      arrow-up
      3
      ·
      edit-2
      2 days ago

      Next version git-tar hero, where you also need to take care of the tar process

      Although I don’t have a realistic direct use case, I thought the name and complexity of the game should be worth it

    • rirus@feddit.org
      link
      fedilink
      English
      arrow-up
      2
      ·
      1 day ago

      Here is the git-music Video: https://www.youtube.com/watch?v=S9Do2p4PwtE

  • Everyday0764@lemmy.zip
    link
    fedilink
    arrow-up
    23
    ·
    2 days ago

    in the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it’s the MR) always rebase.

    this leaves a very readable history, with each feature branch highlighted and no mixture in the commits…

    i haven’t found any downside yet… maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult

    • _stranger_@lemmy.world
      link
      fedilink
      arrow-up
      3
      arrow-down
      1
      ·
      1 day ago

  • qqq@lemmy.world
    link
    fedilink
    arrow-up
    21
    ·
    edit-2
    2 days ago

    Look at this person over here using branches, show off

  • DreamButt@lemmy.world
    link
    fedilink
    English
    arrow-up
    6
    ·
    1 day ago

    Trunk based: am I a joke to you

  • fossilesque@mander.xyz
    link
    fedilink
    English
    arrow-up
    1
    ·
    22 hours ago

    Lmao still nicer than mine.

  • cronenthal@discuss.tchncs.de
    link
    fedilink
    arrow-up
    15
    ·
    2 days ago

    I’ve seen worse … so much worse.

    • SleeplessCityLights@programming.dev
      link
      fedilink
      arrow-up
      3
      ·
      1 day ago

      I have made worse, I used to do a cascading merge everyday to move stuff from dev branches to staging to production. Then I did a merge in the opposite direction for a small selection of branches so they could get their updates from staging. Feature branches were rebased as needed.

  • xia@lemmy.sdf.org
    link
    fedilink
    English
    arrow-up
    4
    ·
    1 day ago

    Nah, just sort by date instead of topology, or vice versa.

  • rtxn@lemmy.world
    link
    fedilink
    arrow-up
    8
    ·
    edit-2
    2 days ago

    I wonder if anyone’s tried to play Bad Apple! on the branch graph.

    (edit) Not exactly, but close. https://www.youtube.com/watch?v=-I8Jis87nmE

  • somerandomperson@lemmy.dbzer0.comOP
    link
    fedilink
    arrow-up
    7
    ·
    2 days ago

    tomfoolery, even

  • dragnucs@lemmy.ml
    link
    fedilink
    arrow-up
    4
    arrow-down
    2
    ·
    2 days ago

    This in fact is vert good d’or large trams that work on 3 to 7 featyres or bug fixes in thé aame tome. Simple, ans vert easy to trace.

    I’ve se en much much worse where you can’t keep track of where branches come from and where they go, and even if you do, you cannot predict what they can contain.

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.

  • 2.37K users / day
  • 4.21K users / week
  • 6.88K users / month
  • 15.6K users / 6 months
  • 1 local subscriber
  • 26.8K subscribers
  • 1.58K Posts
  • 39.6K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.5
  • Modlog
  • Legal
  • Instances
  • Docs
  • Code
  • join-lemmy.org