Closed ecmerkle closed 1 year ago
I made a mistake by doing a pull request (#60) from master to multilevel in the midst of multilevel development. That messed up this attempted pull request in the opposite direction, from multilevel to master. There are other ways to get the changes from master onto a branch, and I now know why they exist.
merge didn't work correctly