title: How to merge features branches to branch develop in Git?
body: <p>I am new to Git and I have a simple question</p>
  
  <p>Though this has been asked many times in this forum, I want to restrict my question to the following scenario</p>
  
  <pre><code>1)  Feature A  (Files A, B and C were modified) cut from 'develop'
  2)  Feature B  (Files A and D were modified) cut from 'develop'
  </code></pre>
  
  <p>Feature A has been merged into branch 'develop' successfully</p>
  
  <p>Now the question is, what approach should we follow to merge 'Feature B' to branch 'develop'</p>
  
  <p>Should we pull the latest version of 'develop' and merge the changes of 'feature b' (or)
  What other best approaches to merge 'feature b' to 'develop' so that 'File A' has all the changes?</p>