Awesome job, , 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 and fixed the conflicts.

Suck it, IntelliJ.

Sign in to participate in the conversation
Functional Café is an instance for people interested in functional programming and languages.