Is there an easy way to detect potential merge/rebase conflict between two branches with git command? For example some files are both modified in two branches, or some files are deleted from one branch and available in another branch. What I can imagine is find common ancestor of two branches with command
git merge-base
and then list all file change status from the common ancestor to the head of the both branches, and then compare the status list to find out the potential merge point. Is this the correct way or something smarter exists? If so how to achieve it?
Thanks a lot.