i hate that vscode had a perfectly serviceable, in fact, good interface for handling git merge conflicts, and then in a recent update they added a new thing that happens instead that's completely inscrutable to me (at least at a first glance)
like i didn't realize that it was doing anything at all, i thought it was just broken and not detecting the merge conflict
and the way you get the old one back is by going into settings and turning off "Git: Merge Editor"
Awoo.space is a Mastodon instance where members can rely on a team of moderators to help resolve conflict, and limits federation with other instances using a specific access list to minimize abuse.
While mature content is allowed here, we strongly believe in being able to choose to engage with content on your own terms, so please make sure to put mature and potentially sensitive content behind the CW feature with enough description that people know what it's about.
Before signing up, please read our community guidelines. While it's a very broad swath of topics it covers, please do your best! We believe that as long as you're putting forth genuine effort to limit harm you might cause – even if you haven't read the document – you'll be okay!