search

bitpay / bitcore-node

Extensible full node using Bitcore
https://bitcore.io/
Other
352 stars 644 forks source link

Cannot Upgrade from 0.1 to 5.0 #577

Open martindale opened 6 years ago

martindale commented 6 years ago

Attempting to merge into martindale/bitcore-node#abaebc9918a95c44d8dc5510f55ec28047011542:

$ git pull upstream master
remote: Counting objects: 28339, done.
remote: Total 28339 (delta 0), reused 0 (delta 0), pack-reused 28339
Receiving objects: 100% (28339/28339), 38.85 MiB | 1.53 MiB/s, done.
Resolving deltas: 100% (15328/15328), done.
From github.com:bitpay/bitcore-node
 * branch              master     -> FETCH_HEAD
 * [new branch]        master     -> upstream/master
fatal: refusing to merge unrelated histories

What is the appropriate upgrade pathway?