...
git checkout develop # be on your develop branch
git rebase upstream/masterdevelop
This should result in your history looking like this:
...
Page Comparison
General
Content
Integrations
App links
...
git checkout develop # be on your develop branch
git rebase upstream/masterdevelop
This should result in your history looking like this:
...