CODEWITHSUNDEEP
git
linquize
linquize

Reputation: 20366

Resolve conflicts on git merge octopus

Octopus merge means to merge more than 2 heads.

How should the user compare files using ordinary 3-way merge tools?

3 files are passed to the merge tool: BASE, LOCAL, REMOTE

How many and what combinations are required for 3 heads?

Upvotes: 9

Views: 2687

Answers (1)

Chronial
Chronial

Reputation: 70653

I would not use an octopus merge in this situation and reserve them for cases where there are no merge conflicts or the conflicts are simple enough that you can resolve them manually without merge tools.

In your situation you should just do 2 normal merges, which will have the same conceptual result as an octopus merge, but will allow your to use your merge tools.

If you want want it to be an octopus merge so your history looks nicer, do the two merges and rewrite your history afterwards. This question has an answer that explains how.

Upvotes: 10

Related Questions