The git-flow
model naturally makes develop
and master
diverge. There is no way to follow that workflow and ensure that one of develop
and master
is always an ancestor of the other.
If you have a look at the commits that are in master
and not in develop
, you should see only merge commits:
git log develop..master
It means that, if you use the following git-log
command, the output should be empty:
git log --no-merges develop..master
If you are not satisfied by this answer, please edit your question to explain why it maters for you that develop
and master
do not diverge from each other.