Skip to content

Solution to resolve problem

Jump to bottom
Hercules-Admin edited this page Jul 16, 2017 · 1 revision

1.To resolve conflict
git pull
git commit -a
git pull
Remove redundant in conflict file
git commit
git push
#Option 👍 git mergetool -t meld

Clone this wiki locally