Issues after git merge (conflicts)

General
1

After resolving merge conflicts, I encounter the issues below:

  • Nodes get unwired

  • Nodes get displaced in the flow.

Has anyone else countered this issue? Any idea on how to resolve this issue?

2

Hi @Theos

I assume you mean merging the conflicts in the editor itself?

What version of Node-RED are you using? There haven't been any similar reported issues in this area, so not a lot to go on.

3

Hello @knolleary.

Thank you very much for replying. I found at that my team is using different version of node, npm, and node red.

I will standardize it and let you know if that fixed the issue.

Cheers.

4

Hello @knolleary,

My team is using Node-RED version: v1.0.2 and Node.js version: v12.12.0. After having everyone use the same version of node red and node.js, this issue still persist.

Any insight will be very much appreciated.

Cheers.

5

Can you provide some detailed steps to recreate the issue?

6

There are the steps to re-create the issue:

  1. Create a branch from master using git
  2. Make code changes on the branch
  3. Go to master and pull the latest code
  4. Go to branch to merge master to the branch
  5. If the merge results to code conflicts, resolve conflicts using node red UI interface.
  6. After conflicts are resolved, there are nodes that lost its connection to other nodes.
7

Unfortunately that is not detailed enough to recreate the issue.

It would really help if you could provide an example flow, a set of specific changes to make on the branch, what resolutions were made to the conflicts and highlight what is broken about the end result.