Git: Merging branches

• The branches are merged to have all the changes in only one branch (eventually in master)
• When changes conflict with each other, the merge fails:

  Automatic merge failed; fix conflicts and then commit the result.