There are plenty of tools that have started popping up to try and improve this situation since last year. CodeTogether, Duckly, Code With Me, and GitLive to name a few. Source: over 2 years ago

GitLive. Extend your IDE with the real-time features remote development teams need to work together effectively. See what your teammates are working on and get notified of merge conflicts before you commit. Make video calls and code together live, VS Code to JetBrains. [GITLIVE]. - Source: dev.to / about 3 years ago

This is in no way an answer to your question but perhaps you would find git.live's merge conflict detection feature useful to potentially avoid the conflicts in the first place 😅. Source: about 3 years ago

Prettier: It makes our code prettier by formatting. It supports many languages and editors. - Source: dev.to / 28 days ago

A big part of my work revolves around JavaScript tooling, and as such it's important to keep an eye on the ecosystem and see where things are going. It's no secret that recently lots of projects are native-ying (??) parts of their codebase, or even rewriting them to native languages altogether. Esbuild is one of the first popular and successful examples of this, which was written in Go. Other examples are Rspack... - Source: dev.to / about 1 month ago

Do you use Prettier? Have your configuration settings caused weird HTML rendering issues by adding extra whitespace where you didn't want it? Perhaps after an anchor link at the end of a paragraph? Me, too. Here's what's happening and how you might be able to fix it. - Source: dev.to / about 1 month ago

In this post, I also use ESLint + Standard JS as my code formatting tools. Formatting JS/TS code by using ESLint is also subjective and opinionated, arguably most people would rather use Prettier instead, which provides more configurable options. - Source: dev.to / about 2 months ago

Automating code checks with static code analysis allows us to enforce code styling effectively. By integrating tools into our workflow, we can identify errors at an early stage, while coding instead of blocking us at the end. For instance, flake8 checks Python code for style and errors, eslint performs similar checks for JavaScript, and prettier automatically formats code to maintain consistency. - Source: dev.to / about 2 months ago