I did a ‘Squash and merge’ to close a PR. Although all the changes are now present in both the develop and master, it still says the branches have diverged and there are still changes ahead and behind the default branch.
This branch is 1 commit ahead, 28 commits behind develop.
How do I fix this? The 28 commits are the commits which were squashed during ‘squash and merge’.
I assumed that squash and merge would do a fast forward merge to prevent the divergence. I don’t want all the commits from develop to move to master, which is why I did a “squash and merge”, instead of rebasing.