Question

When I try to rebase one of my branches onto another, git is not able to merge and raises conflict. I can see the following in the conflicted file:

<<<<<<< HEAD
=======
  if (($mode == 'w')) {
    $mode = 'r';
    var_export($GLOBALS, true);
    //print("<pre>");
    //var_dump(array_keys($GLOBALS));
    //print("</pre>");
  }
>>>>>>> 7896670... Some initial changes that I carried over from other directory...

I am just wondering why git is not able to merge these two commits? It is a trivial merge, isn’t it? One version contains nothing and another version contains something, so the merge is simple. What am I missing?

Answer 1

Check the common ancestor of them (the merge base) — it should contains something else.

git diff `git merge-base HEAD 7896670` HEAD