DEV Community

loading...
Cover image for Solving Merge Conflicts with Pycharm

Solving Merge Conflicts with Pycharm

Anja
Software Engineer | Linux fan | lawyer | Sharing what I'm learning 😊
・1 min read

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/

Discussion (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! 😊

Forem Open with the Forem app