Apply to branch with error "branch is in conflict mode"

[benjibenoit]

Version

0.12.7

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

I have my main branch and I want to merge my coworkers branch into mine to get his code. When I click on "Apply" on his branch I get this error :

And the little label "Conflict" appears :

But I'm totally unable to merge his branch. I just get the error

How to reproduce

No response

Expected behavior

No response

Relevant log output

No response