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
[–] 27 points 2 months ago (32 children)

rebase & fixup or reset are your friends

  • permalink
  • fedilink
  • source
  • hideshow 32 child 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
  • [+] [S] -16 points 2 months ago (16 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 16 child comments
    •
  • [–] 21 points 2 months ago* (9 children)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 9 child comments
    •
  • [+] [S] -7 points 2 months ago (8 children)

    My bad for having a salary

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

    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.

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

    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.

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

    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.”

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

    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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 7 points 2 months ago (2 children)

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

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

    Future you might not think the same

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

  • permalink
  • fedilink
  • source
  • parent