title: GIT - how to merge branches?
body: <p>We decided to use GIT in our company but now got a problem..
  We have several branches with different features. Now what we need is to merge that branches and push it to Master. How shall we do that with autoreplace - we have branch-a, branch-b, branch-c - we need to get them all in Master but in case of repeated files the branch-b should be Major and branch-c - minor.</p>
  
  <p>Upd:
  <br/></p>
  
  <pre>
  branch-a:
  -file1
  -file2
  -file3
  -file4
  </pre>
  
  <p><br/></p>
  
  <pre>
  branch-b:
  -file1
  -file5
  -file6
  </pre>
  
  <p><br/></p>
  
  <pre>
  branch-c:
  -file1
  -file2
  -file7
  -file8
  </pre>
  
  <p>we need in result:
  <br/></p>
  
  <pre>
  Master:
  -file1 (from b)
  -file2 (from a)
  -file3 (from a)
  -file4 (from a)
  -file5 (from b)
  -file6 (from b)
  -file7 (from c)
  -file8 (from c)
  </pre>