I have the same problem in my team, the only way I know not to create the MAB
commit is to git checkout develop
, then git pull
and finally Bob can finish his feature.
In this way the develop
branch where Bob is finishing his feature, points to the MA
commit.
Of course Alice has to push her local develop
branch before Bob can finish his feature.