Answers for "branches 'develop' and 'origin/develop' have diverged. and branch 'develop' may be fast-forwarded"

0

branches 'develop' and 'origin/develop' have diverged. and branch 'develop' may be fast-forwarded

What happens here is that the remote has received updates, and git-flow requires that develop and origin/develop to be at the same commit before merging back the feature. This is to prevent bad conflicts when publishing the branch.

To solve this, you need to:

sync your local develop with origin: checkout develop, and pull from origin to develop 
git checkout develop && git pull origin

rebase your feature on develop with 
git flow feature rebase showFindLogs. 

You may have conflicts here if you're unlucky
check that it doesn't break anything

git flow feature finish showFindLogs
Posted by: Guest on March-22-2022

Browse Popular Code Answers by Language