Dealing with git unmerged files