Diffs and conflict resolution

Sooner or later, you’re going to perform a pull prior to pushing some changes only to discover a conflict exists. This can be intimidating and stressful even for experienced developers because you are running the risk of breaking someone else’s recent contribution. Nevertheless, it happens and you need a way to deal with the problem. This leads us to one of my favorite features in PyCharm. In Chapter 1, Introduction to PyCharm – the Most Popular IDE for Python, I told you about my experience with Microsoft’s debugger. Having experienced it early in my career, to me, nothing else will do. I have the same regard for PyCharm’s merge tool. Resolving a conflicted merge in anything else feels painful.

There is only one file in the project. By now, you’ll recognize it as the main.py file PyCharm generates with new projects. We’re going to generate a conflict using the following steps:

1. Create a new project...