# Resolve conflict in node red, show - 1 unresolved conflict

**URL:** <https://discourse.nodered.org/t/resolve-conflict-in-node-red-show-1-unresolved-conflict/56794>\
**Category:** General\
**Created:** [17 January 2022 12:02 UTC](https://discourse.nodered.org/t/resolve-conflict-in-node-red-show-1-unresolved-conflict/56794 "2022-01-17T12:02:58Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![essereumano](https://sea2.discourse-cdn.com/flex026/user_avatar/discourse.nodered.org/essereumano/32/48262_2.png) [@essereumano](https://discourse.nodered.org/u/essereumano)\
**Post date:** [17 January 2022 12:02 UTC](https://discourse.nodered.org/t/resolve-conflict-in-node-red-show-1-unresolved-conflict/56794/1 "2022-01-17T12:02:58Z")

</div>

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

 ![conf1](https://us1.discourse-cdn.com/flex026/uploads/nodered/original/3X/8/5/85241c0b95fd197d984edf98e4d524a05265c465.png)  
 ![conf](https://us1.discourse-cdn.com/flex026/uploads/nodered/original/3X/8/3/83b936420b14f55c1f7bf1216a369cf34b4f4105.png)

---

<div class="post-metadata">

**Author:** ![essereumano](https://sea2.discourse-cdn.com/flex026/user_avatar/discourse.nodered.org/essereumano/32/48262_2.png) [@essereumano](https://discourse.nodered.org/u/essereumano)\
**Post date:** [17 January 2022 12:06 UTC](https://discourse.nodered.org/t/resolve-conflict-in-node-red-show-1-unresolved-conflict/56794/2 "2022-01-17T12:06:46Z")

</div>

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

---

<div class="post-metadata">

**Author:** ![system](https://us1.discourse-cdn.com/flex026/uploads/nodered/original/1X/d073cd938eafa2e558d7c2cd59003b3ef4963033.png) [@system](https://discourse.nodered.org/u/system)\
**Post date:** [18 March 2022 12:07 UTC](https://discourse.nodered.org/t/resolve-conflict-in-node-red-show-1-unresolved-conflict/56794/3 "2022-03-18T12:07:42Z")

</div>

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