Git 相关问题

Problem: error: failed to push some refs to

solution: git pull --rebase origin master 从本地拉取git远程仓库之后解决冲突