沒有做任何更改時Git合並沖突

Question

我克隆了一個回購，然后，幾個小時后，我做了'git pull'。 但是出現了合並沖突，我不明白為什么，因為我沒有對克隆回購進行任何改動。

git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean


git pull
remote: Counting objects: 6211, done.
remote: Compressing objects: 100% (849/849), done.
remote: Total 3237 (delta 2756), reused 2846 (delta 2371)
Receiving objects: 100% (3237/3237), 865.51 KiB | 152.00 KiB/s, done.
Resolving deltas: 100% (2756/2756), completed with 867 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next
 + 76c2c6d...4d046e9 master     -> origin/master  (forced update)
 + 1e13928...003e6ba akpm       -> origin/akpm  (forced update)
 + 9d1d11d...8bcfe39 akpm-base  -> origin/akpm-base  (forced update)
   37504a3b..8ba4caf stable     -> origin/stable
 * [new tag]         next-20140918 -> next-20140918
Performing inexact rename detection: 100% (318500/318500), done.
Auto-merging tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
CONFLICT (content): Merge conflict in tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE03
Auto-merging localversion-next
CONFLICT (add/add): Merge conflict in localversion-next
Auto-merging kernel/rcu/tree.c
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Auto-merging drivers/target/target_core_fabric_configfs.c
CONFLICT (content): Merge conflict in drivers/target/target_core_fabric_configfs.c
Auto-merging drivers/target/iscsi/iscsi_target_util.c
Auto-merging drivers/hwmon/Kconfig
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/clk/rockchip/clk-rk3288.c
Auto-merging arch/mips/include/asm/topology.h
Auto-merging arch/m68k/coldfire/m54xx.c
Auto-merging Next/quilt-import.log
CONFLICT (add/add): Merge conflict in Next/quilt-import.log
Auto-merging Next/merge.log
CONFLICT (add/add): Merge conflict in Next/merge.log
Auto-merging Next/SHA1s
CONFLICT (add/add): Merge conflict in Next/SHA1s
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 5040 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

git status
On branch master
Your branch and 'origin/master' have diverged,
and have 236 and 347 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:
    ...

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both added:      Next/SHA1s
    both added:      Next/merge.log
    both added:      Next/quilt-import.log
    both modified:   drivers/gpu/drm/i915/i915_gem.c
    both modified:   drivers/target/target_core_fabric_configfs.c
    both modified:   kernel/rcu/tree.c
    both added:      localversion-next
    both modified:   tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt

Answer 1

首先，我每天都在使用一些預防措施......

當我不期望任何實際的合並時，我學會了使用git merge --ff-only 。 我看到也可以使用git pull --ff-only但更常見的是我使用git pull --rebase因此它不會創建任何合並提交，而是在上游重放我的本地更改（如果有的話）。 但是，我無法解釋這個問題，因為我不知道linux-next的規則。

合並沖突的唯一原因是合並到不同的分支。 如果你的分支沒有改變，人們會期待一個干凈的快進合並。 適合您的描述的唯一解釋是遠程不再在其歷史記錄中包含您的提交，這意味着上游具有重寫的歷史記錄。 這在一些工作流程中非常常見，其中已發布的分支只是指向最新提交更多更改集的指針。 但是我沒有關於linux-next的具體信息。

危險區域：當出現這種情況時，您可以使用git fetch上游數據，然后使用git reset --hard origin/master更新您的分支參考git reset --hard origin/master （使用實際遠程和分支名稱替換origin和master ）。 但是請確保您沒有任何想要保存的更改，因為這是一種破壞性操作。

Answer 2

除了Pavel的評論之外，請確保您還沒有提交尚未上傳的承諾更改。 在這種情況下，如果你看到你有0個需要提交的文件（也許睡眠不足），你可能會有點困惑，當它想要開始合並時。

Answer 3

我為解決這個問題所做的是暫時切換到另一個分支，刪除（本地）具有合並沖突的分支，然后再次獲取分支。