title: Resolve merge conflict between different branch
body: <p>My company have this kind of rules:</p>
  
  <ol>
  <li>Feature branch is created from master branch</li>
  <li>Once feature branch completed, we make a PR to develop branch</li>
  <li>Once PR approved, merge to develop</li>
  <li>After QA testing, feature branch will be merged back to master</li>
  </ol>
  
  <p>This flow created lots of unnecessary merge-conflict when trying make a PR (although if PR with master there is no issue), how can we improve the situation?</p>
  
  <p>Edit: It seems likely my company use trunk based development and use develop branch only for testing ground for new feature (sometimes feature are developed with several branch by different developer)</p>