Command line to resolve the conflict

git stash

git pull

git stash pop

To choose to stay in the page data

Guess you like

Origin www.cnblogs.com/wssdx/p/12470726.html