Book Image

Hands-On Application Development with PyCharm - Second Edition

By : Bruce M. Van Horn II, Quan Nguyen
5 (1)
Book Image

Hands-On Application Development with PyCharm - Second Edition

5 (1)
By: Bruce M. Van Horn II, Quan Nguyen

Overview of this book

In the quest to develop robust, professional-grade software with Python and meet tight deadlines, it’s crucial to have the best tools at your disposal. In this second edition of Hands-on Application Development with PyCharm, you’ll learn tips and tricks to work at a speed and proficiency previously reserved only for elite developers. To achieve that, you’ll be introduced to PyCharm, the premiere professional integrated development environment for Python programmers among the myriad of IDEs available. Regardless of how Python is utilized, whether for general automation scripting, utility creation, web applications, data analytics, machine learning, or business applications, PyCharm offers tooling that simplifies complex tasks and streamlines common ones. In this book, you'll find everything you need to harness PyCharm's full potential and make the most of Pycharm's productivity shortcuts. The book comprehensively covers topics ranging from installation and customization to web development, database management, and data analysis pipeline development helping you become proficient in Python application development in diverse domains. By the end of this book, you’ll have discovered the remarkable capabilities of PyCharm and how you can achieve a new level of capability and productivity.
Table of Contents (24 chapters)
1
Part 1: The Basics of PyCharm
4
Part 2: Improving Your Productivity
9
Part 3: Web Development in PyCharm
15
Part 4: Data Science with PyCharm
19
Part 5: Plugins and Conclusion

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...