Those merging conflicts a totally normal. Don’t consider them as a bad new. I solved some of them a couple of weeks ago, just to test, in a local repo. As I already said in a prior post, don’t worry, I can be in charge of the merging task. Best regards, -- Ricard Civil 6 jun 2021 8:56 por vjudeu@gazeta.pl:
I have some good news and some bad news. The good news is that all CPUchain-related changes seems to be present only in the latest seven commits:
8fe10f3f minkcrypto@gmail.com Update build-unix.md 8a4243a2 minkcrypto@gmail.com misc: change branding of cpupower 1e58bcbc minkcrypto@gmail.com Update seeds 77c68b45 minkcrypto@gmail.com Add additional rpc call support for ApiServer f19e2ba9 minkcrypto@gmail.com Update README.md 5d1cced8 minkcrypto@gmail.com Update README.md c82cee8f minkcrypto@gmail.com CPUchain Core 0.18.1 fa27a076 laanwj@gmail.com doc: Bump manpages pre-final
In the Bitcoin Core source code, there is fa27a076 commit hash, so I assume (correct me if I am wrong, but it seems to be true as far as I know how Git works) the whole history up to that point is present in both coins. The bad news is that after switching to bitcoin and picking that seven changes on top of the latest released version, there are many conflicts and I am still trying to figure out some way to merge that in a clear way that can be accepted by everyone. _______________________________________________ Cpuchain-dev mailing list -- cpuchain-dev@mailman3.com To unsubscribe send an email to cpuchain-dev-leave@mailman3.com