Git SourceTree 集成更改

Question

我在推送存储库时遇到问题。

hint: Updates were rejected because the tip of your current branch is behind

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

但是在提取我朋友所做的更改后，没有任何反应。

我们正在做不同的部分，我认为应该不会有任何冲突。

我们只有一家分店。

Answer 1

以下是适合您情况的方法：

# Get the remote changes
# Two commits:
# - add new folder
# - add languages
git pull origin master

# This should have caused a merge commit.
# If Git asks you to provide a commit message, do that.
# If there are conflicts, fix them and commit the changes
# After that, push your changes (merge commit + UI balance update)
git push origin master

这几乎是标准工作流程 - 这几乎适用于所有人。如果其中一个命令显示错误，请更新您的问题。

这些事情最好从命令行完成 - 了解底层的 Git 命令将对您长期有益运行。

Git SourceTree 集成更改

Git SourceTree integrate changes

git

atlassian-sourcetree