federate.cc
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
Gonzako@lemmy.world to Programmer Humor@programming.dev ·
edit-2
2 months ago

Boys, don't dev alone or you'll end up with a git log like mine

lemmy.world

video
message-square
71
link
fedilink
63
video

Boys, don't dev alone or you'll end up with a git log like mine

lemmy.world

Gonzako@lemmy.world to Programmer Humor@programming.dev ·
edit-2
2 months ago
message-square
71
link
fedilink
alert-triangle
You must log in or # to comment.
  • con_fig@programming.dev
    link
    fedilink
    arrow-up
    27
    arrow-down
    1
    ·
    2 months ago

    👏 Learn 👏 to 👏 squash 👏 those 👏 commits 👏

    • fibojoly@sh.itjust.works
      link
      fedilink
      arrow-up
      14
      ·
      2 months ago

      Seriously. My colleague does the same shit and it made me so mad until I realised he was on his branch. Then I was like, whatever, as long as you do a proper MR.

  • AstroLightz@lemmy.world
    link
    fedilink
    arrow-up
    23
    ·
    2 months ago

    You don’t just write your entire project, then make your first commit?

    /j

    • irelephant [he/him]@lemmy.dbzer0.com
      link
      fedilink
      arrow-up
      9
      ·
      2 months ago

      I do kinda do that with the initial commit (don’t commit anything until I have something really basic that works). It feels awkward to commit code that does nothing.

      • wpb@lemmy.world
        link
        fedilink
        arrow-up
        11
        ·
        2 months ago

        That’s all I ever commit

  • exu@feditown.com
    link
    fedilink
    English
    arrow-up
    17
    ·
    2 months ago

    rebase & fixup or reset are your friends

    • Jerkface (any/all)@lemmy.ca
      link
      fedilink
      English
      arrow-up
      9
      ·
      2 months ago

      I love editing history. Fix the bug in the change that introduced it!

      • we_need_more_dwellings@piefed.world
        link
        fedilink
        English
        arrow-up
        10
        ·
        2 months ago

        Then force-push, and fuck up someone’s day!

        • ThotDragon@lemmy.blahaj.zone
          link
          fedilink
          English
          arrow-up
          8
          ·
          edit-2
          2 months ago

          git branches are free
          work in your tree
          til the changes are ready
          300 git push --force-with-lease a day and nobody mad

          • Default Username@lemmy.dbzer0.com
            link
            fedilink
            English
            arrow-up
            2
            ·
            2 months ago

            I prefer to force push directly to the production branch.

            • ThotDragon@lemmy.blahaj.zone
              link
              fedilink
              English
              arrow-up
              3
              ·
              2 months ago

              computer equivalent of being a nudist

          • Evotech@lemmy.world
            link
            fedilink
            arrow-up
            2
            arrow-down
            1
            ·
            2 months ago

            Continuous integration is better. Fight me

            • ThotDragon@lemmy.blahaj.zone
              link
              fedilink
              English
              arrow-up
              3
              ·
              2 months ago

              Nothing about continuous integration prevents you from using a branch to prepare your changes.

              • Evotech@lemmy.world
                link
                fedilink
                arrow-up
                3
                ·
                edit-2
                2 months ago

                Yes, if you use feature branches its literally not continuous. It’s adjacent though.

                Continuous Integration is a software development practice where each member of a team merges their changes into a codebase together with their colleagues changes at least daily

                Meaning everything is in a version controlled mainline

                • exu@feditown.com
                  link
                  fedilink
                  English
                  arrow-up
                  2
                  ·
                  2 months ago

                  So does everyone work directly on main all the time? Do all of you work on the same project or are there multiple with one person per project? How do you work around the broken code your coworker just pushed so you can finish your tasks?

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      0
      arrow-down
      3
      ·
      2 months ago

      I personally don’t really care for the meaningful messages or a pretty log. I only see these myself.

      • Jerkface (any/all)@lemmy.ca
        link
        fedilink
        English
        arrow-up
        9
        ·
        edit-2
        2 months ago

        And clearly as a Windows developer, you hate yourself and don’t believe you deserve nice things, so it all checks out.

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          0
          arrow-down
          4
          ·
          2 months ago

          My bad for having a salary

          • Jerkface (any/all)@lemmy.ca
            link
            fedilink
            English
            arrow-up
            6
            ·
            2 months ago

            This is just your self-hatred turned outwards. I forgive you.

          • tyler@programming.dev
            link
            fedilink
            arrow-up
            3
            ·
            2 months ago

            I’m very confused haha. didn’t you say this code was just personal code? or that it was just for yourself? If you’re at a job why are you committing like this?

            in any case, I’m sorry for the absolute crazy amounts of hate you’re getting for using windows. I do highly recommend trying out linux though. unless you’re doing cad or 3d modeling, you will likely have zero issue using it.

            • Gonzako@lemmy.worldOP
              link
              fedilink
              arrow-up
              0
              arrow-down
              2
              ·
              2 months ago

              I’m the only programmer at the company. It’s a closed source solution for very specific needs. So I only answer to myself and I don’t have a need to explain (to myself) what I did in a particular commit and if I ever need to check the commit history I can just check a particular files history, not going commit by commit. I never said it was personal code. I said “don’t code alone”. I use linux at home, the server hosting the code commits is linux, the scripts listening to new commits are in bash.

              • tyler@programming.dev
                link
                fedilink
                arrow-up
                2
                ·
                2 months ago

                Whoever works that job after you leave is going to curse your family lol. That’s wild to think like that.

                • Gonzako@lemmy.worldOP
                  link
                  fedilink
                  arrow-up
                  1
                  ·
                  2 months ago

                  Generational Trauma

          • partofthevoice@lemmy.zip
            link
            fedilink
            arrow-up
            2
            ·
            2 months ago

            With my salary, I am boss of my OS. I tell my boss, “you really want me working on that pile of shit? Okay, it’s your time.”

            • Gonzako@lemmy.worldOP
              link
              fedilink
              arrow-up
              0
              arrow-down
              2
              ·
              2 months ago

              I didn’t make this post to defend someone elses decision and all this thread is doing is assume shit because I got to use windows. Yes, composer takes ages to optimize the autoloads on windows. I know.

              You’re all just being insufferable to someone forced to use it.

              • Jerkface (any/all)@lemmy.ca
                link
                fedilink
                English
                arrow-up
                2
                ·
                edit-2
                2 months ago

                I mean if you’re taking it this seriously, it was probably way more on the nose than I realized when I just intended it to be silly.

      • floquant@lemmy.dbzer0.com
        link
        fedilink
        arrow-up
        5
        ·
        2 months ago

        Future you might not think the same

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          1
          arrow-down
          1
          ·
          2 months ago

          Should I find a problem solved by me adding commit messages i’ll gladly do it. I use stuff as I find an usecase for it. Atm, i’m completely alone so i’ve 0 need to write up what my changes do. It personally gets in the way of quickly iterating and then testing.

      • fibojoly@sh.itjust.works
        link
        fedilink
        arrow-up
        3
        arrow-down
        1
        ·
        2 months ago

        Ah sweet summer child…

      • Serinus@lemmy.world
        link
        fedilink
        arrow-up
        2
        ·
        2 months ago

        Then why are you using source control at all? You can manually copy the directory and name it “— Copy”.

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          0
          ·
          2 months ago

          I set up CI/CD that silently boots up the changes pushed on main

          • tyler@programming.dev
            link
            fedilink
            arrow-up
            3
            ·
            2 months ago

            then just always force push. You’re not even using the source control, you might as well just use a shell script to deploy rather than listening on CI/CD

  • towerful@programming.dev
    link
    fedilink
    arrow-up
    15
    ·
    2 months ago

    Yeh I use git (git commit --amend)

    • Archr@lemmy.world
      link
      fedilink
      arrow-up
      4
      ·
      edit-2
      2 months ago

      git commit --amend --no-edit and git push --force-with-lease

      No-edit skips opening an editor for the commit message and just reuses the same message.

      Force-with-lease will force push but only if your local is not missing commits that remote has. Ie other people haven’t pushed anything since you last pulled.

    • wpb@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      edit-2
      2 months ago

      If you’re comfortable with whatever text editor git uses, give git rebase -i a try.

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      0
      ·
      2 months ago

      Would this also trigger (git rev-parse) to change? I have CI/CD listening to changes on the master branch

      • Holla@feddit.org
        link
        fedilink
        arrow-up
        3
        ·
        edit-2
        2 months ago

        When you have to amend a commit that you have already pushed you have to force push the amendment. That should then trigger the Pipeline

        • tyler@programming.dev
          link
          fedilink
          arrow-up
          5
          ·
          2 months ago

          –force-with-lease though, not just force… It’s a good habit to have because then when you are working with other people you won’t fuck everything up.

      • 𝕱𝖎𝖗𝖊𝖜𝖎𝖙𝖈𝖍@lemmy.world
        link
        fedilink
        arrow-up
        2
        ·
        2 months ago

        Work off the master branch first, don’t push to prod until you’re ready to

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          0
          ·
          2 months ago

          Well, prod is luckily the people I have next room. I made the setup so changes get uploaded quickly. I could do branches and all that stuff?

          Yeah, but i’d rather not work to work and just get it out the door. What my setup is for is that changes get pulled off the master branch and deployed without an apparent interruption of service.

          I see collaboration tools just the same as abstractions, you don’t use them just to use them. They need to solve a problem.

          • 𝕱𝖎𝖗𝖊𝖜𝖎𝖙𝖈𝖍@lemmy.world
            link
            fedilink
            arrow-up
            2
            ·
            2 months ago

            …do you not use branches?

            • Gonzako@lemmy.worldOP
              link
              fedilink
              arrow-up
              0
              ·
              2 months ago

              It’s a collaboration tool and i’m not collaborating with anyone so why’d I bother going through the extra bells and whistles?

              • 𝕱𝖎𝖗𝖊𝖜𝖎𝖙𝖈𝖍@lemmy.world
                link
                fedilink
                arrow-up
                3
                ·
                2 months ago

                VCS’s are organizational tools as much as they are collaboration tools. You should learn it and use it to improve your coding abilities through better management.

  • Alavi@programming.dev
    link
    fedilink
    arrow-up
    14
    ·
    2 months ago

    A dev on windows? Of course that’s your git log!

  • olenkoVD@lemmy.dbzer0.com
    link
    fedilink
    arrow-up
    13
    ·
    2 months ago

    Skill issue

    • bss03@infosec.pub
      link
      fedilink
      English
      arrow-up
      4
      ·
      2 months ago

      Yep. https://gitlab.com/bss03/halogen-lambda/-/commits/main

      Not an issue, https://gitlab.com/bss03/type-aligned/-/commits/main

      for real devs. https://gitlab.com/bss03/nested/-/commits/main

      • Gonzako@lemmy.worldOP
        link
        fedilink
        arrow-up
        1
        arrow-down
        4
        ·
        2 months ago

        Has your real dev commits gotten you a real dev job? You seem to be looking for a job offer on your mastodon since february and i’m worried for you.

        • bss03@infosec.pub
          link
          fedilink
          English
          arrow-up
          7
          ·
          edit-2
          2 months ago

          I’m not sure if any of those commits did, but I worked 2 years doing Haskell backend and jQuery+Bootstrap frontend for Masterword. Before that I did some work for Wire: https://github.com/wireapp/wire-server/commits?author=stephen-smith Before that, I worked at TGCS for nearly a decade.

          But, right now I am still looking for work. I’ve actually been looking since April 2025 when my time at Masterword ended, but I did update my “hire me” posts back in February because my living situation changed, opening up more opportunities. Originally I needed something remote so I could continue to take care of my father (RIP), now relocation is certainly an option.

          If anyone reading this has a position available, or is just curios, my current resume public: https://docs.google.com/document/d/1ORf48b557nK0gYI4h6J0xP7nzOVRoqtOogYsukUMREU

          • vanillama@programming.dev
            link
            fedilink
            arrow-up
            5
            ·
            2 months ago

            Best of luck finding a job, sorry about your father

            • bss03@infosec.pub
              link
              fedilink
              arrow-up
              2
              ·
              2 months ago

              ty

  • 𝕱𝖎𝖗𝖊𝖜𝖎𝖙𝖈𝖍@lemmy.world
    link
    fedilink
    arrow-up
    8
    ·
    2 months ago

    You need to learn refactoring/squashing

  • Azura The Spellkissed@lemmy.blahaj.zone
    link
    fedilink
    arrow-up
    8
    ·
    2 months ago

    [Test] around and find out

  • tdgoodman@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    7
    ·
    2 months ago

    I cannot give you a 100% for consistency. You have three inconsistent check in messages: ‘tet’, ‘FueraEstanciaRowRename’, and ‘Revert “test”’. You must be uniformly informative with your messages.

  • copacetic@discuss.tchncs.de
    link
    fedilink
    English
    arrow-up
    6
    ·
    2 months ago

    Looks like a normal branch where someone debugs some GitHub workflow.

  • slazer2au@lemmy.world
    link
    fedilink
    English
    arrow-up
    4
    ·
    2 months ago

    Small incremental changes are good.

    • Evotech@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      2 months ago

      Very few people actually practice continuous integration

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      1
      arrow-down
      1
      ·
      2 months ago

      Test

      • slazer2au@lemmy.world
        link
        fedilink
        English
        arrow-up
        4
        ·
        2 months ago

        Fix

        Fix?

        Fixed?

        This one right?

        Why?

        …

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          1
          ·
          2 months ago

          That was while I still had a soul

  • one_old_coder@piefed.social
    link
    fedilink
    English
    arrow-up
    4
    ·
    2 months ago

    Is it humor because we make fun of you?

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      3
      ·
      2 months ago

      More like laughs out of relatability. Tho I am getting dogpiled for the industry standard practice of using what the company provides.

  • python@lemmy.world
    link
    fedilink
    arrow-up
    4
    ·
    2 months ago

    well yeah, in an enterprise project we would say “chore(test)”. Semantic release ftw!

  • asudox@lemmy.asudox.dev
    link
    fedilink
    arrow-up
    3
    ·
    2 months ago

    my private repo is filled with “stuff”, “more stuff”, “new stuff”, “changes” commits.

  • folekaule@lemmy.world
    link
    fedilink
    arrow-up
    2
    ·
    2 months ago

    I see I’m not the only one fighting with CI/CD pipelines.

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.

  • 1.52K users / day
  • 3.13K users / week
  • 7.56K users / month
  • 16.4K users / 6 months
  • 1 local subscriber
  • 33K subscribers
  • 1.8K Posts
  • 41.5K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.12
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org