2 ms·
> “ours” and “theirs” while merging or rebasing This was always super confusing to me. I'm happy since using fork.dev that instead of "ours"/"theirs" it just n
by bhandziuk 3y ago
> “ours” and “theirs” while merging or rebasing
This was always super confusing to me. I'm happy since using fork.dev that instead of "ours"/"theirs" it just names the branches. So much clearer. I know that's a GUI and not command line but no other GUIs I've seen have done so. 0