Resolve conflict in node red, show - 1 unresolved conflict

Hi everyone, I have activated projects and cloned a repository from github, when I create new local branches and connect them to remote branches I am shown an error that there are conflicts that cannot be solved automatically, clicking on the error I am brought to a window where I have to select which versions to keep, select the desired ones, so however it still reports 3 unresolved conflicts and I cannot go on, I have checked the whole screen but there are no other conflicts that require you to choose which one to keep. I attach the screen for greater clarity. Thank for your support

Try another time I give -1 unresolved conflict... I'm confused

This topic was automatically closed 60 days after the last reply. New replies are no longer allowed.