Comment by grovellogic

You can merge master/develop into your PR multiple times, always keeping it up to date with the latest until until it can be merged.

This is the magic of git, it allows multiple merges something that wasn't possible in older systems.