Git错误提示Integrate the remote changes...
欢迎使用Markdown编辑器
错误提示
* branch master -> FETCH_HEAD
error: could not apply 60dd513... blank project
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 60dd513... blank project
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
hint: Updates were rejected because the tip of your current branch is behind
! refs/heads/master:refs/heads/master [rejected] (non-fast-forward)
hint: its remote counterpart. Integrate the remote changes (e.g.
Done
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
解决办法
由于本地和远程仓库两者代码文件不同步，因此需要先pull，进行合并然后再进行push
先使用pull命令,再使用push命令
git pull --rebase origin master
git push -u origin master
|