Git（可能）冲突解决工作流

假设有多个人同时在存储库上工作，并且远程源代码管理 （SCM） 是 GitHub。 您应该为您的工作创建一个拉取请求（这在其他 SCM 提供商中也称为合并请求）。

然后，这应该由项目的另一个成员审查并合并。如果存在冲突，它不会允许您合并 PR。然后，您需要在远程 SCM 上或本地解决，具体取决于 SCM 提供商。

如果您必须在本地重新定位。您可以采取两种方法。master

1. 你上面提到的方法。切换分支并执行变基的位置
2. 您可以使用 Git 的功能来拉取远程上存在的所有分支。git fetch

使用第二种方法可以避免切换分支，但仍然具有与第一种方法相同的效果。

使用第二种方法时，需要运行：

• git fetch以拉动遥控器上的所有更改。这将更新存储库的索引。origin
• git rebase origin/master.由于我们只使用 fist 命令更新了索引，因此您需要说您要从 ;因此originoriginorigin/master

下面是一个示例

在这里发展是你的主人

• 更新索引以匹配远程origin

users:() ➜  (10/02 22:52) ~/dummy git:(feature/rebase-test) ✗ git fetch
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:praveenprem/dummy
   5029e07..429a6e6  develop    -> origin/develop

• 使用更新的索引而不是本地索引进行变基。origin/developdevelop

users:() ➜  (10/02 22:52) ~/dummy git:(feature/rebase-test) ✗ git rebase origin/develop
First, rewinding head to replay your work on top of it...
Fast-forwarded feature/rebase-test to origin/develop.

users:() ➜  (10/02 22:53) ~/dummy git:(feature/rebase-test) ✗ git add .
users:() ➜  (10/02 22:53) ~/dummy git:(feature/rebase-test) ✗ git commit
[feature/rebase-test 9cb6ad0] Add test file 3
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test-3.txt

users:() ➜  (10/02 22:54) ~/dummy git:(feature/rebase-test) git flow feature finish rebase-test
Switched to branch 'develop'
Your branch is behind 'origin/develop' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Merge made by the 'recursive' strategy.
 test-2.txt | 1 +
 test-3.txt | 0
 2 files changed, 1 insertion(+)
 create mode 100644 test-2.txt
 create mode 100644 test-3.txt
Deleted branch feature/rebase-test (was 9cb6ad0).

Summary of actions:
- The feature branch 'feature/rebase-test' was merged into 'develop'
- Feature branch 'feature/rebase-test' has been removed
- You are now on branch 'develop'

users:() ➜  (10/02 22:54) ~/dummy git:(develop) git pull
Already up to date.

users:() ➜  (10/02 22:55) ~/dummy git:(develop) git push
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 1.77 KiB | 452.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:praveenprem/dummy.git
   429a6e6..ae38b95  develop -> develop

您可能注意到，当我合并 brach 时，它告诉我我的分支在 1 个提交的后面。但是，当合并在推送合并之前执行 at 时，没有要拉取的更改。developgit pull

希望这对您的用例有所帮助。