flashgnash@lemm.ee to Linux@lemmy.ml · 9 months agoMost of us hate Microsoft, and yet many of us use VSCodemessage-squaremessage-square465fedilinkarrow-up1448arrow-down150file-text
arrow-up1398arrow-down1message-squareMost of us hate Microsoft, and yet many of us use VSCodeflashgnash@lemm.ee to Linux@lemmy.ml · 9 months agomessage-square465fedilinkfile-text
minus-squareintensely_human@lemm.eelinkfedilinkarrow-up7·9 months agoA merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.
minus-squareOsrsNeedsF2P@lemmy.mllinkfedilinkarrow-up3·9 months ago5 years of merging conflicts, I still don’t know when to use --theirs or --ours
minus-squareintensely_human@lemm.eelinkfedilinkarrow-up1·9 months 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?