https://github.com/Epix37/Hearthstone-Deck-Tracker

以上面版本庫的master分支為例

父節(jié)點1

SHA-1: a21142968282ae49720cf30a0f18290b2ce74b3a

* remove hotkey from config if action could not be found, fix hotkey menu item name

父節(jié)點2

SHA-1: 86a824e8f46005db91f334dfc57b6bb58b85ceed

* fix effigy logic

合并后的節(jié)點

SHA-1: abc0e44f72a4f73523a202c9ee77c8622c1e9fbc

* Merge branch 'master' into joshtab-feature-SecretDeduction

Conflicts:

Hearthstone Deck Tracker/GameEventHandler.cs

Hearthstone Deck Tracker/Hearthstone/GameV2.cs

======新的版本庫，自己進(jìn)行整理的=====

在進(jìn)行代碼整理的時候，遇到了沖突

現(xiàn)在chucklu_master分支指向這個commit

SHA-1: 88fa1ee9263402626d85b5a4362e1b620935953f

* remove hotkey from config if action could not be found, fix hotkey menu item name

temp1分支指向這個commit

SHA-1: 86a824e8f46005db91f334dfc57b6bb58b85ceed

* fix effigy logic

現(xiàn)在執(zhí)行，rebase操作。

首先切換分支到temp1

然后執(zhí)行g(shù)it rebase chucklu_master

$ git rebase chucklu_master

First, rewinding head to replay your work on top of it...

Applying: proof of concept: secret deduction via game rules

Applying: add hooks: spell cast, minion play, minion death

Using index info to reconstruct a base tree...

M Hearthstone Deck Tracker/GameEventHandler.cs

M Hearthstone Deck Tracker/IGameHandler.cs

M Hearthstone Deck Tracker/LogReader/Handlers/PowerGameStateHandler.cs

M Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs

:110: trailing whitespace.

if (actionEntity.HasTag(GAME_TAG.CONTROLLER) &&

warning: 1 line adds whitespace errors.

Falling back to patching base and 3-way merge...

Auto-merging Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs

Auto-merging Hearthstone Deck Tracker/LogReader/Handlers/PowerGameStateHandler.c

s

Auto-merging Hearthstone Deck Tracker/IGameHandler.cs

Auto-merging Hearthstone Deck Tracker/GameEventHandler.cs

Applying: add remaining paladin secret tracking

Applying: remove click-to-gray, respect setting

Applying: changed GameEventHandler.HandlePlayerAttack to consider attacker and d

efender,

Using index info to reconstruct a base tree...

M HDTTests/HDTTests.csproj

M Hearthstone Deck Tracker/GameEventHandler.cs

M Hearthstone Deck Tracker/IGameHandler.cs

M Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs

:301: trailing whitespace.

warning: 1 line adds whitespace errors.

Falling back to patching base and 3-way merge...

Auto-merging Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs

Auto-merging Hearthstone Deck Tracker/IGameHandler.cs

Auto-merging Hearthstone Deck Tracker/GameEventHandler.cs

CONFLICT (content): Merge conflict in Hearthstone Deck Tracker/GameEventHandler.

cs

Auto-merging HDTTests/HDTTests.csproj

Failed to merge in the changes.

Patch failed at 0005 changed GameEventHandler.HandlePlayerAttack to consider att

acker and defender,

The copy of the patch that failed is found in:

d:/SourceCode/GitHub/Hearthstone-Deck-Tracker/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".

If you prefer to skip this patch, run "git rebase --skip" instead.

To check out the original branch and stop rebasing, run "git rebase --abort".

遇到?jīng)_突后，rebase暫停，CONFLICT (content): Merge conflict in Hearthstone Deck Tracker/GameEventHandler.cs

找到原始的版本庫的合并節(jié)點SHA-1: abc0e44f72a4f73523a202c9ee77c8622c1e9fbc

雙擊GameEventHandler.cs文件

所以，可以換種處理方式，前面沖突的話，全部用temp1本身的的。

Administrator@LUJUNTAO /d/SourceCode/GitHub/Hearthstone-Deck-Tracker/Hearthstone

Deck Tracker (temp1|REBASE 5/16)

$ git rebase --continue

Applying: changed GameEventHandler.HandlePlayerAttack to consider attacker and d

efender,

Applying: SecretTests: added more SingleSecret tests, simplified secret verifica

tion

Applying: SecretTests: fix minion CARDTYPE

Applying: refactor HandlePlayerAttack, fix misdirection

Using index info to reconstruct a base tree...

M Hearthstone Deck Tracker/GameEventHandler.cs

M Hearthstone Deck Tracker/Hearthstone/GameV2.cs

Falling back to patching base and 3-way merge...

Auto-merging Hearthstone Deck Tracker/Hearthstone/GameV2.cs

Auto-merging Hearthstone Deck Tracker/GameEventHandler.cs

CONFLICT (content): Merge conflict in Hearthstone Deck Tracker/GameEventHandler.

cs

Failed to merge in the changes.

Patch failed at 0008 refactor HandlePlayerAttack, fix misdirection

The copy of the patch that failed is found in:

d:/SourceCode/GitHub/Hearthstone-Deck-Tracker/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".

If you prefer to skip this patch, run "git rebase --skip" instead.

To check out the original branch and stop rebasing, run "git rebase --abort".

這樣處理完之后，temp1拼接在了chucklu_master分支后面，此時切換到chucklu_master分支

合并的時候，不會產(chǎn)生沖突

所以在合并的時候，需要選擇不提交 no commit。

然后再去手動將本應(yīng)該沖突的文件修改為之前的合并結(jié)果中的文件，進(jìn)行提交

把合并結(jié)果abc0e44f72a4f73523a202c9ee77c8622c1e9fbc中的文件內(nèi)容全部復(fù)制出來，作為沖突合并的結(jié)果。完全復(fù)制到?jīng)_突的那個文件中替換掉。

最后一次才用最終的合并結(jié)果

補充說明，重新嘗試了一次，雖然沖突

但是使用tortoisegit進(jìn)行對比的時候，發(fā)現(xiàn)向下瀏覽的沖突按鈕next confilict，是無效的

直接save，并且標(biāo)記沖突為解決

總結(jié)

以上是生活随笔為你收集整理的git 怎么查看合并过来哪些代码_git整理纷乱的历史合并记录的全部內(nèi)容，希望文章能夠幫你解決所遇到的問題。

如果覺得生活随笔網(wǎng)站內(nèi)容還不錯，歡迎將生活随笔推薦給好友。