Unable to understand merge common ancestor output and reason of conflict...

using vimdiff in git-merge, how can I show the commit ids?...

Git: how to update branch made by merge-base...

git merge-base not working on merged branch...