You're not going to see files with conflict markers, the conflict says
CONFLICT (rename/delete): core/projectX/path/to/java/file deleted in R1
and renamed in HEAD.
which means there's a conflict because the file was renamed in your current
branch, while it was deleted altogether in R1.
You have to tell git how to resolve that conflict (i.e. do you want to rename
the file, or delete it?). Git left behind the renamed version of the file in
your working copy:
Version HEAD of core/projectX/path/to/java/file
left in tree.
If you do git status
, you'll see something like this:
$ git status
On branch test
Your branch and 'origin/test' have diverged,
and have 1 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
Unmerged paths:
(use "git add <file>..." to mark resolution)
added by them: core/projectX/path/to/java/file
You can either choose to keep the renamed version of the file by doing git add <file>
,
or you can remove it by using git rm <file>
. Then commit the changes. That's
how you resolve the merge conflict in this case.