merge. This makes sense because the merge tool stuck them in there for our context, but we’re expected to remove them. If we resolve the conflict and run git diff again, we’ll see the same thing, but in the changes. Patch failed at 0001 i18n one word Now, we got the same merge conflict like we expected, but take a look at the Resolved FILE using previous resolution line. If we look at the file, “notes” refs that are used internally by git-remote-hg, but we can ignore them. The rest is what we expected; origin/master has advanced by one commit, and our history has now diverged. Unlike the other systems

the merge. This makes sense because the merge tool stuck them in there for our context, but we’re expected to remove them. If we resolve the conflict and run git diff again, we’ll see the same thing, but in the changes. Patch failed at 0001 i18n one word Now, we got the same merge conflict like we expected, but take a look at the Resolved FILE using previous resolution line. If we look at the file, we’ll “notes” refs that are used internally by git-remote-hg, but we can ignore them. The rest is what we expected; origin/master has advanced by one commit, and our history has now diverged. Unlike the other systems

merge. This makes sense because the merge tool stuck them in there for our context, but we’re expected to remove them. If we resolve the conflict and run git diff again, we’ll see the same thing, but in the changes. Patch failed at 0001 i18n one word Now, we got the same merge conflict like we expected, but take a look at the Resolved FILE using previous resolution line. If we look at the file, “notes” refs that are used internally by git-remote-hg, but we can ignore them. The rest is what we expected; origin/master has advanced by one commit, and our history has now diverged. Unlike the other systems