I get that it’s open source provided you use codium not code but I still find that interesting

  • glowie@infosec.pub
    link
    fedilink
    arrow-up
    5
    arrow-down
    2
    ·
    1 year ago

    Have you had a merge conflict yet? A breeze to manage with GH Desktop + VSC

    • intensely_human@lemm.ee
      link
      fedilink
      arrow-up
      7
      ·
      1 year ago

      A merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.

    • worldofgeese@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      edit-2
      1 year ago

      I use Linux on my home desktop and my work desktop but I also keep a Windows install on my work machine when I need to test Windows things there. On Windows, I haven’t found a better Git GUI than fork.dev. It’s not open-source but it is what one of my favorite creators calls “organic software”: Ukrainian husband and wife duo that warms my heart. The evaluation period is unlimited without nags. I’ve found it to be the perfect Git teaching tool and the best merge conflict resolver I’ve ever seen.

    • flashgnash@lemm.eeOP
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      I’ve done it with vsc, haven’t used GH desktop do you use it alongside vsc or does it just do a similar thing?