• fibojoly@sh.itjust.works
      link
      fedilink
      arrow-up
      17
      ·
      3 days 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.

  • tdgoodman@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    10
    ·
    2 days 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.

    • Archr@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      edit-2
      2 days 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
      1
      ·
      edit-2
      1 day ago

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

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      1
      ·
      3 days 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
        5
        ·
        edit-2
        3 days 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
          ·
          3 days 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.

          • doppydrop@lemmy.ca
            link
            fedilink
            arrow-up
            2
            ·
            3 days ago

            This is good advice, I got too used to being a solo dev that once I worked with a larger team… mistakes were made.

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          1
          ·
          3 days 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.

      • VibeSurgeon@piefed.social
        link
        fedilink
        English
        arrow-up
        0
        ·
        3 days ago

        Well, there’s your problem.

        Get yourself a nice button/endpoint you can hit to trigger CI/CD that way instead

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          1
          ·
          3 days ago

          You’re saying it’s a problem but i’m not really reading why. While the idea of a massive button to push changes is fun having the master branch be production is a concrete idea i’ve grown fond of, iteration is fast, both at testing and deployment.

        • ThotDragon@lemmy.blahaj.zone
          link
          fedilink
          English
          arrow-up
          13
          ·
          edit-2
          3 days 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

              • Evotech@lemmy.world
                link
                fedilink
                arrow-up
                3
                ·
                edit-2
                3 days 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

                People disagree about what CI is, but that’s the definition i subscribe to

                • exu@feditown.com
                  link
                  fedilink
                  English
                  arrow-up
                  0
                  ·
                  3 days 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
      1
      ·
      3 days 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
        21
        ·
        edit-2
        3 days ago

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

          • tyler@programming.dev
            link
            fedilink
            arrow-up
            4
            ·
            3 days 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
              1
              ·
              3 days 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.

          • partofthevoice@lemmy.zip
            link
            fedilink
            arrow-up
            4
            ·
            3 days 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
              1
              ·
              3 days 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
                6
                ·
                edit-2
                3 days 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.

      • Serinus@lemmy.world
        link
        fedilink
        arrow-up
        7
        ·
        3 days ago

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

          • tyler@programming.dev
            link
            fedilink
            arrow-up
            4
            ·
            3 days 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

        • Gonzako@lemmy.worldOP
          link
          fedilink
          arrow-up
          1
          ·
          3 days 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.

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

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

    • Gonzako@lemmy.worldOP
      link
      fedilink
      arrow-up
      6
      ·
      3 days ago

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