Merge is /o\ like I can see the case for merging the feature branch into the develop branch, but merging the develop branch into the feature branch seems a bit less clean. (versus detaching your changes and attaching them again from to a more recent point?)

I think we definitely need to test what happens if you rebase something that's been submitted for a pull request!