title: How to push the same edit to different branches in git?
body: <p>I have a Git repository which has a master branch. Now I want to create different branches which have the same changes in every branch (for example the database). So I can have these files in <strong>master</strong>:</p>
  
  <ul>
  <li>a.java</li>
  <li>b.java</li>
  <li>database-1.xml</li>
  </ul>
  
  <p>and two branches, called <strong>branch-1</strong> and <strong>branch-2</strong>, with these files:</p>
  
  <ul>
  <li>a.java</li>
  <li>b.java</li>
  <li>database-branch-1.xml</li>
  </ul>
  
  <p>and</p>
  
  <ul>
  <li>a.java</li>
  <li>b.java</li>
  <li>database-branch-2.xml</li>
  </ul>
  
  <p>Now, let that I find a bug in <code>a.java</code>, obviously I would like to fix it and commit the same change in every branch. How can I achieve my goal?</p>
  
  <p><strong>Note</strong>: The database files must remain different and the other files will be always the same.</p>