Just pull develop into your feature branch daily. Merging develop to master is a one-lane highway so merges are only required if you did a production patch.