New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git应用 #4

Open

smallbore opened this issue Jul 17, 2017 · 0 comments

Owner

smallbore commented Jul 17, 2017 •

edited

Loading

git fetch --all
git reset --hard origin/master

本地与服务器冲突，强制下载服务器端的。
无论是git，还是svn，发生冲突，都应该是删除本地，再获取，或者重新路径获取，比较，手动更改。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment