Rebase Supremacy - eviltoast
  • trxxruraxvr@lemmy.world
    link
    fedilink
    arrow-up
    13
    ·
    7 months ago

    In a small team at a small company it becomes my problem pretty quickly, since I’m the only one that actually has some clue about what git does.

    • Cyborganism@lemmy.ca
      link
      fedilink
      arrow-up
      6
      ·
      7 months ago

      This. When they get any sort of conflicts in their pull request, it becomes MY problem because they don’t know what to do.

    • zalgotext@sh.itjust.works
      link
      fedilink
      arrow-up
      2
      ·
      7 months ago

      Heaven forbid my teammates read any documentation or make any attempt to understand the tooling necessary to do their job.

      That being said, I taught my dumbass git-illiterate team members a rebase workflow, with the help of the git UI in Pycharm. Haven’t had any issues with merge conflicts yet, but that might just be because they’re too scared to ask me for help any more