The Github "network" manager is quite helpful here, as it allows visualizing branches and commits easily. For any major feature/change please make a new branch for it, and merge with master when consensus is reached that the feature deserves inclusion.