Resolve Git conflicts | IntelliJ IDEA Documentation
Merge Conflicts: What They Are and How to Deal with Them | CSS-Tricks - CSS-Tricks
Ο χρήστης Tower στο Twitter: "1. MERGE IMPROVEMENTS When a merge conflict pops up, you will now see our brand-new Merge UI indicating the number of unresolved conflicts between the two branches.