DEV Community

Cover image for Solving Merge Conflicts with Pycharm
Anja
Anja

Posted on

Solving Merge Conflicts with Pycharm

#git

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 •

Thanks Matt! 😊

Read next

aerabi profile image

Git Cheat Sheet for Hacktoberfest

Mohammad-Ali A'RÂBI -

cleobnvntra profile image

Learning three-way recursive merge

Cleo Buenaventura -

gkarwchan profile image

Are you still using git checkout for everything? It is time to switch to git switch

Ghassan Karwchan -

abdo_zr profile image

how can i access the flach drive without having to formmat it

Abdo ZR -