2-way vs. 3-way merge

Scenario

             c1b06e --- 62d8d3 [feature]
              /
e73a83 --- 6cfaec --- 90ed1b [develop]

Goal: Merge feature into develop.

2-way merge

Solve the merge conflicts with comparing 90ed1b (develop) and 62d8d3 (feature).

enum Colors
{
  Red,
  Navy,
  Green
}

enum Colors
{
  Red,
  Blue,
  Lime
}

It’s not possible to solve the merge conflicts with this information.

3-way merge

Solve the merge conflicts with comparing 90ed1b (develop), 6cfaec (merge-base) and 62d8d3 (feature).

enum Colors
{
  Red,
  Navy,
  Green
}

enum Colors
{
  Red,
  Blue,
  Green
}

enum Colors
{
  Red,
  Blue,
  Lime
}

It’s possible to solve the merge conflicts with this information.