IntelliJ IDEA: Resolving Merge Conflicts in Git

Описание: When you work in a team, you may come across a situation when somebody pushes changes to a file you are currently working on. If these changes do not overlap, the conflicting files are merged automatically. However, if the same lines were affected, Git cannot randomly pick one side over the other, and asks you to resolve the conflict.
In this screencast, we're going to take a look at resolving merge conflicts.

For more information, take a look at: https://jb.gg/waysas

*Author: Marit van Dijk

Download IntelliJ IDEA: https://jb.gg/download-intellij-idea

Join us:

Website https://jb.gg/website
Blog https://jb.gg/blog
Twitter   / intellijidea  
Facebook   / intellijidea  

#intelliJIDEA #intelliJ #jetbrains #java #programming