3 ms·

I’m not sure if gitfriend is a typo. I’m lonely and really want a gitfriend to push and merge with! Please tell the story of how you got one! /s for the /s im

by mmh0000 8mo ago

I’m not sure if gitfriend is a typo. I’m lonely and really want a gitfriend to push and merge with! Please tell the story of how you got one! /s for the /s impaired

DonHopkins 8mo ago
I'm afraid of commits.
- dotancohen 8mo ago
  You could wait a bit after forking.
  - Towaway69 8mo ago
    Squash commit can fix the conflict.
    - mmh0000 8mo ago
      Doesn't work if there are too many diffs
      - Towaway69 8mo ago
        Diffs can always be patched up.
      - deleted 8mo ago
        [deleted]
- BeetleB 8mo ago
  It always ends up with a lot of blaming. In extreme cases, it terminates with a bisect.