Add this function to your ZSH/BASH init to do a sane update of develop and master. Handy when you come back to a project after a couple of days.
Note that this doesn't merge develop into your current branch, but I'll leave that to you to add if you need it :).