PyCharm
 
Get PyCharm
You are viewing the documentation for an earlier version of PyCharm.

Resolve conflicts

Last modified: 23 August 2023

Depending on your version control system, conflicts may arise in different situations.

When you work in a team, you may come across a situation when somebody commits changes to a file you are currently working on. If these changes do not overlap (that is, changes were made to different lines of code), the conflicting files are merged automatically. However, if the same lines were affected, your version control system cannot randomly pick one side over the other and asks you to resolve the conflict.

Conflicts may also arise when merging, rebasing, or cherry-picking branches.