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
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
I'm afraid of commits.
It always ends up with a lot of blaming.
In extreme cases, it terminates with a bisect.
You could wait a bit after forking.
Squash commit can fix the conflict.
Doesn't work if there are too many diffs
Diffs can always be patched up.