I am actually thinking on leaving NodeLinked in. I am actually inclined to improve its design, although by now I'll leave it as it is. We can re-discuss it.
NodeLinked is removed in branch node-linked-removed
Please try to make merge tests from your branches to this branch. I suggest this:
git commit <my last developments in my branch>git checkout node-linked-removedgit checkout -b test git merge <my branch>
see what conflicts come up. Possibly a lot, but hopefully not (I already merged master into node-linked-removed so we are not sooo far apart). Call me to see what to do.
Depending of the results of your testing, I will take an action or another to merge node-linked-removed into master. And will come back with further instructions.
After the testing, if you do not want to keep the test branch, you can delete it:
git commit <my last developments in my branch>git fetch <gitlab remote>git checkout -b my_branch_on_top_node_linked_removegit rebase node-linked-removed
Again conflicts might come up. In case things are getting too messy :
This has been merged to master. I sent a couple of emails with this info a couple of days ago but they did not go through. I hope this hasn't created much trouble.