Git merge conflict, but there is no visible difference

Viewed 3172

I often get conflicts when merging branches that look like this:

<<<<<<< HEAD
    private readonly IAdminService _adminService;

=======
    private readonly IAdminService _adminService;

>>>>>>> refs/remotes/origin/master

There is no visible difference. What would cause github to view this as a conflict?

1 Answers
Related