Closed dmi3kno closed 5 years ago
@dmi3kno I deleted the branch because I don't know what I'm doing with resolving these merge conflicts.
Could you submit the PR again. I think I’ve just got to go back and resolve each conflict one by one. Not sure if there is an automatic solution.
Whenever you wake up and ready to go some damage. Could you create a new branch off of master
which would be called dev-rx_string
. Your dev
branch is ahead of master
and I hate to rebase again.
Yeah sorry about that. I will be creating a new branch and then resolve all the merge conflicts today.
No, just create a branch from master
and I will PR into it. There will be no merge conflicts
dev-rx_string branch created from master
This is significant rewrite of pretty much all functions. Test are running fine, but some examples in the documentation are failing. We can fix those later. Lets get conceptually aligned on the way forward