title: Android Studio, Git and three ways merge
body: <p>On Android Studio, I created a new branch from the master and commited the new branch two times.
  Then I checkedout the master and commited it one time.
  So I have two branches with two distinct endpoints and a common parent.
  Now I am trying a three ways merge:
  right click on the new branch, click on the new branch name, then merge, but appears a popup</p>
  
  <blockquote>
    <p>Couldn't merge TestMergeBranch
    CONFLICT (content): Merge conflict in
    (...  files' list  ...)</p>
  </blockquote>
  
  <p>and nothing more happens.</p>
  
  <p>Thus I click on VCS menu, Git, Resolve conflicts. Then I click Accept Yours button to resolve the conflicts on selected files. The Resolve window disappears, and again nothing more happens.</p>
  
  <p>Thus I go to re-add to stage the resolved files but the Add option is disabled.</p>
  
  <p>Any hints?</p>
  
  <p>(Android Studio 2.0 on Ubuntu 14.04)</p>
  
  <p><em>--- It needs an android-studio-git Tag ---</em></p>