• 1 Post
  • 57 Comments
Joined 1 year ago
cake
Cake day: June 17th, 2023

help-circle


  • Yeah I’ve been using Inkscape instead for all my drawing needs for quite a while now. I find working with vector graphics to be much easier. Each thing you add is an object that can be altered continuously.

    Plus I like that you can export to other formats at any size or any scale without loss.










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