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/