DEV Community 👩‍💻👨‍💻

Cover image for Solving Merge Conflicts with Pycharm
Anja
Anja

Posted on

Solving Merge Conflicts with Pycharm

Hi everyone! Today I show you how you can solve merge conflicts in Pycharm. Take care and stay healthy! :)

➤ Timestamps
0:00​ Intro
0:15​ Provoking a conflict
1:15​ Solving the conflict

Find me also here:
https://www.instagram.com/lumarycodes/​
➤ My Blog: https://lumarycodes.wordpress.com/

Top comments (2)

Collapse
mccurcio profile image
Matt Curcio

Hi Anja,
Great video, straight to the point and easy to follow too. ;)

Collapse
anja profile image
Anja Author

Thanks Matt! 😊

🌚 Browsing with dark mode makes you a better developer.

It's a scientific fact.