126
Boys, don't dev alone or you'll end up with a git log like mine (lemmy.world)
submitted 2 months ago* by to c/programmer_humor@programming.dev
77 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] 17 points 2 months ago (14 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 14 child comments
    •
  • [–] 16 points 2 months ago (13 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 13 child comments
    •
  • [–] 15 points 2 months ago* (11 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 11 child comments
    •
  • [–] 2 points 2 months ago (8 children)

    Continuous integration is better. Fight me

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 8 child comments
    •
  • [–] 6 points 2 months ago (7 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 7 child comments
    •
  • [–] 2 points 2 months ago* (last edited 2 months ago) (6 children)

    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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 6 child comments
    •
  • [–] 2 points 2 months ago (5 children)

    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?

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 5 child comments
    •
  • [–] 3 points 2 months ago* (3 children)

    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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 3 points 2 months ago (1 child)

    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?

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] [S] 1 point 2 months 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.

  • permalink
  • fedilink
  • source
  • parent