• 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?

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

                  Yea you always work on main on the same project.

                  You don’t push broken code. You always need to keep mainline healthy

                  It takes some special considerations, but the benefits are great.

                  • kewjo@lemmy.world
                    link
                    fedilink
                    arrow-up
                    1
                    ·
                    3 days ago

                    so when something breaks both devs, the one who made the previous change and the person pushing new, have to work together to solve the issue? no PRs or is everything a fork? do you revert and rebase every change?

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

                  I personally make feature files. So if i’m working on FactorySeederModemLookupVector.ts someone elses could work on ☝️🥵🙏.php without bothering each other. Tho, my collabs have been ones with a LOT of communication.