DEV Community

Discussion on: How to resolve merge conflicts with git

Collapse
 
darkwiiplayer profile image
𒎏Wii 🏳️‍⚧️

An easier way of doing it:

git pull
git mergetool

😜

Collapse
 
piotrs profile image
Piotr S

Thanks!