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

  • OsrsNeedsF2P
    link
    fedilink
    arrow-up
    3
    ·
    1 year ago

    5 years of merging conflicts, I still don’t know when to use --theirs or --ours

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

      This is the first I’m hearing of those flags. Is it a way of specifying commits without knowing the hash?