title: Git push specific commit to remote branch
body: <p>I have a Git repo hosted on Bitbucket. If I have 3 branches say <code>master</code>, <code>branch_2</code>, and <code>branch_3</code>. I have pulled down the <code>master</code> branch to my local machine which I've made a change on, committed and pushed. Now to keep things up to date I want to push that commit onto <code>branch_2</code> and <code>branch_3</code> how do I do that? I don't have those branches set up locally. </p>
  
  <p>I've tried <code>git pull origin branch_2</code> to set up that branch locally but I'm now getting </p>
  
  <blockquote>
    <p>Auto-merging .gitignore CONFLICT (add/add): Merge conflict in
    .gitignore Automatic merge failed; fix conflicts and then commit the
    result.</p>
  </blockquote>