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.

IntelliJ IDEA: Resolving Merge Conflicts in Git

Links

3 thoughts on “IntelliJ IDEA: Resolving Merge Conflicts in Git”

  1. Pingback: Cherry-pick: Move a commit to a different branch - Marit van Dijk
  2. Pingback: Cherry pick a commit to a different branch - Marit van Dijk
  3. Pingback: The Art of Cherry Picking - Marit van Dijk

Comments are closed.