• 0 Posts
  • 72 Comments
Joined 1 year ago
cake
Cake day: June 17th, 2023

help-circle









  • When I was a poor student I pirated everything. Music, software, games, you name it.

    Now that I have a good stable income, I pay for the things I want because I want to encourage artists and developers. But corporations and capitalism are ruining it all.

    So, I’m changing my habits. Paying money where it actually has a significant impact on the creators, (like going to live concerts and shows, buying albums directly from the artist or from their own site, buying indie games from small studios, going to watch movies from studios that respect their employees and artists and unions) and pirating the ever loving shit out of everything else coming out of a large corporation.




  • Cyborganism@lemmy.catoProgrammer Humor@programming.devRebase Supremacy
    link
    fedilink
    arrow-up
    53
    arrow-down
    2
    ·
    edit-2
    3 months ago

    I prefer to rebase as well. But when you’re working with a team of amateurs who don’t know how to use a VCS properly and never update their branc with the parent branch, you end up with lots of conflicts.

    I find that for managing conflicts, rebase is very difficult as you have to resolve conflicts for every commit. You can either use rerere to repeat the conflict resolution automatically, or you can squash everything. But when you’re dealing with a team of Git-illiterate developers (which is VERY often the case) you can either spend the time to educate them and still risk having problems because they don’t give a shit, or you can just do a regular merge and go on with your life.

    Those are my two cents, speaking from experience.