All of the internal GitHub development was done on branches, so things stayed very simple. We developed on feature branches and merged to master. That's it. As long as you communicate well between team members you can avoid merge conflicts 99% of the time.

Or maybe I'm misunderstanding your question. Let me know if that's the case.