3 ms·
Oh, no, not again! Anyway: how do I resolve merge conflicts in version control?
by jwatte 11y ago
Oh, no, not again!
Anyway: how do I resolve merge conflicts in version control?
- kefka 11y agoWith that Windows flowchart tool, no clue. But with Node-Red, I can use Flow-Cloner to close the main repo to my local machine. Then I can do work, and make sequential updates to my project in projects/project1/flows.json and use GIT as normal. Then I submit them as any source commit. Then the project owner can then clone the .json file into stable/main/dev as appropriate. And yes, that works, because it's what I do.
- striking 11y agoLVMerge and LVDiff showed how it's possible with LabVIEW.