title: GIT merge branch code with latest hotfix code
body: <p>I have created a separate branch in git for my new requirement and i have pushed/commited my changes in that new branch.</p>
  
  <p>Finally, i have to merge my branch with the latest hotfix branch.</p>
  
  <p>Am not sure how i can do that using <code>git bash commands</code>.</p>
  
  <p>for example :</p>
  
  <pre><code>My new branch : Requirement1_branch
  hotfix branch : hotfix
  </code></pre>
  
  <p>Still now, am doing the manual comparasion of files and doing the merge. Is there any other way to do merge using git bash.</p>
  
  <p><a href="https://i.stack.imgur.com/OSQWq.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/OSQWq.png" alt="enter image description here"></a></p>