My project is now going into testing and release phase. We will keep master and develop branches in parallel, where develop will have Pull Requests with new feature and fixes and master only fixes for current release.<p>We have 8 people working in the project and dozes of Pull Requests everyday. We are currently using git flow. But I'm worried that hotfix branches will have tons of conflicts with develop branch in the long run.<p>What are the best practices to manage fixes and new features?