Awesome job, #IntelliJ, showing the old version of a file while adding the new, full of conflicts, in the Git repo.
... so I opened the same file in #VIM and fixed the conflicts.
Suck it, IntelliJ.
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!