title: Issue with Git merge
body: <p>I have the following issue on git merge.
  Initially we had 2 branches, 1 is master and the other is alpha on which we have the changes. Now we created a new branch called beta from the tip of master and pushed it.We would like to merge the changes from alpha on to beta. This is what we followed:<br>
  1)clone the repository<br>
  2)checked out to Beta and then did a merge using tortoise git.<br>
  3)we were able to see 51 conflicts and we resolved one among them and pushed it to the repo.<br>
  4)Now, when we tried to resolve remaining 50 conflicts, we got a message saying that project is up to date.<br>
  We are not able to see the changes both on our local and remote.Please can any of you guide me on the right approach?</p>