@[email protected] to [email protected] • 1 year agoMost of us hate Microsoft, and yet many of us use VSCodemessage-square436fedilinkarrow-up1423arrow-down149file-text
arrow-up1374arrow-down1message-squareMost of us hate Microsoft, and yet many of us use VSCode@[email protected] to [email protected] • 1 year agomessage-square436fedilinkfile-text
minus-square@[email protected]linkfedilink6•1 year agoA merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.
minus-square@[email protected]linkfedilink3•1 year ago5 years of merging conflicts, I still don’t know when to use --theirs or --ours
minus-square@[email protected]linkfedilink1•1 year agoThis is the first I’m hearing of those flags. Is it a way of specifying commits without knowing the hash?
A merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.
5 years of merging conflicts, I still don’t know when to use --theirs or --ours
This is the first I’m hearing of those flags. Is it a way of specifying commits without knowing the hash?