Most of us hate Microsoft, and yet many of us use VSCode

flashgnash@lemm.ee to Linux@lemmy.ml – 393 points –

I get that it's open source provided you use codium not code but I still find that interesting

455

You are viewing a single comment
View all commentsShow the parent comment

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?