UnknownObject/github-help
1
0
Fork 0
mirror of https://github.com/waylau/github-help.git synced 2026-08-12 20:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Dealing with non-fast-forward errors 处理 non-fast-forward 错误.md

Browse Source
This commit is contained in:
Way Lau
2014-11-15 23:11:07 +08:00
parent 8797e8a9b8
commit eb817c416c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dealing with non-fast-forward errors 处理 non-fast-forward 错误.md
+2 -2
View File
@@ -13,7 +13,7 @@ Dealing with non-fast-forward errors 处理 non-fast-forward 错误
# Merge the remote changes (e.g. 'git pull') before pushing again. See the # Merge the remote changes (e.g. 'git pull') before pushing again. See the
# 'Note about fast-forwards' section of 'git push --help' for details. # 'Note about fast-forwards' section of 'git push --help' for details.
可以在本地通过 fetch（获取） 与 merge （合并） 相同的分支的 change （变化） 来解决: 可以在本地通过 [fetch（获取） 与 merge （合并）](https://github.com/waylau/github-help/blob/master/Fetching%20a%20remote%20%E8%8E%B7%E5%8F%96%E8%BF%9C%E7%A8%8B%E5%BA%93.md) 相同的分支的 change （变化） 来解决:
$ git fetch origin $ git fetch origin
# Fetches updates made to an online repository # Fetches updates made to an online repository
@@ -23,4 +23,4 @@ Dealing with non-fast-forward errors 处理 non-fast-forward 错误
可以简单使用`git pull` 提交: 可以简单使用`git pull` 提交:
$ git pull origin branch $ git pull origin branch
# Grabs online updates and merges them with your local work # Grabs online updates and merges them with your local work