GIT organizes a messy history merge record

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

Take the master branch of the previous repository as an example

Parent Node 1

SHA-1: a21142968282ae49720cf30a0f18290b2ce74b3a

* Remove Hotkey from config If action could not being found, Fix hotkey menu item name

Parent Node 2

SHA-1:86a824e8f46005db91f334dfc57b6bb58b85ceed

* Fix Effigy logic

The merged node

SHA-1: ABC0E44F72A4F73523A202C9EE77C8622C1E9FBC

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

Conflicts:
Hearthstone Deck Tracker/gameeventhandler.cs
Hearthstone Deck Tracker/hearthstone/gamev2.cs

====== the new repository and organize it yourself =====

When the code is being collated, a conflict is encountered

Now the Chucklu_master branch points to this commit

SHA-1:88fa1ee9263402626d85b5a4362e1b620935953f

* Remove Hotkey from config If action could not being found, Fix hotkey menu item name

The Temp1 branch points to this commit

SHA-1:86a824e8f46005db91f334dfc57b6bb58b85ceed

* Fix Effigy logic

Now execute, rebase operation.

Switch branches to Temp1 first

Then execute git 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
<stdin>: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
<stdin>: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 was found in:
D:/sourcecode/github/hearthstone-deck-tracker/.git/rebase-apply/patch

When you had 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".

Rebase paused after encountering a conflict, CONFLICT (content): Merge CONFLICT in Hearthstone Deck Tracker/gameeventhandler.cs

Find merge node for original repository SHA-1: ABC0E44F72A4F73523A202C9EE77C8622C1E9FBC

Double-click the GameEventHandler.cs file

So, you can change the way of treatment, the previous conflict, all with Temp1 itself .

[Email protected]/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 was found in:
D:/sourcecode/github/hearthstone-deck-tracker/.git/rebase-apply/patch

When you had 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".

When this is done, the Temp1 is stitched behind the Chucklu_master branch and switches to the Chucklu_master branch

When merging, no conflict occurs.

So when merging, you need to choose not to commit no commit.

Then go manually modify the file that should be conflicting to the file in the previous merge result, commit

Copies the contents of the file in the merge result ABC0E44F72A4F73523A202C9EE77C8622C1E9FBC as a result of the conflict merging. The file that was completely copied to the conflict is replaced.

Last time with the final merge results.

Supplementary instructions, and tried again, though the conflict

However, when using tortoisegit for comparison, it is not valid to find the conflicting button next confilict to navigate down.

Direct save, and tag conflict for resolution

GIT organizes a messy history merge record