Git branching is usually pretty straight forward and although merging can be a hassle it is important to remember the reasons for the isolation. In the event a hotfix is required, it is handy to branch off from master instead of develop - this way we can test the fix on the develop branch before merging back to master. The beauty of this makes git so powerful and the reason it's the most popular software version control software at the moment. Also a quick mention that git branch --merged to see what's now part of the new master as this will list each individual feature, bugfix or hotfix as a list. Great for generating release notes.