I tried to follow this:
https://forum.biblepay.org/index.php?topic=490.0But running:
# git pull origin develop
returns me conflicts:
warning: redirecting to
https://github.com/biblepay/biblepay-evolution/From
http://github.com/biblepay/biblepay-evolution * branch develop -> FETCH_HEAD
Auto-merging src/version.h
CONFLICT (content): Merge conflict in src/version.h
Auto-merging src/validation.h
CONFLICT (content): Merge conflict in src/validation.h
Auto-merging src/validation.cpp
CONFLICT (content): Merge conflict in src/validation.cpp
Auto-merging src/smartcontract-server.cpp
Auto-merging src/rpcpog.h
CONFLICT (content): Merge conflict in src/rpcpog.h
Auto-merging src/rpcpog.cpp
CONFLICT (content): Merge conflict in src/rpcpog.cpp
Auto-merging src/rpc/misc.cpp
Auto-merging src/rpc/masternode.cpp
CONFLICT (content): Merge conflict in src/rpc/masternode.cpp
Auto-merging src/rpc/blockchain.cpp
CONFLICT (content): Merge conflict in src/rpc/blockchain.cpp
Auto-merging src/rest.cpp
CONFLICT (content): Merge conflict in src/rest.cpp
Removing src/qt/res/images/crownium/unchecked.png
Removing src/qt/res/images/crownium/splash_testnet.png
Removing src/qt/res/images/crownium/splash.png
Removing src/qt/res/images/crownium/drkblue_walletFrame_bd.png
Removing src/qt/res/images/crownium/checked.png
Removing src/qt/res/images/crownium/about.png
Removing src/qt/res/icons/light/toolbar_testnet.png
Removing src/qt/res/icons/light/toolbar.png
Removing src/qt/res/icons/light-retro/toolbar_testnet.png
Removing src/qt/res/icons/light-retro/toolbar.png
Auto-merging src/qt/masternodelist.cpp
CONFLICT (content): Merge conflict in src/qt/masternodelist.cpp
Auto-merging src/qt/coincontroldialog.cpp
CONFLICT (content): Merge conflict in src/qt/coincontroldialog.cpp
Auto-merging src/pose.h
Auto-merging src/net.cpp
CONFLICT (content): Merge conflict in src/net.cpp
Auto-merging src/llmq/quorums_dkgsessionhandler.cpp
CONFLICT (content): Merge conflict in src/llmq/quorums_dkgsessionhandler.cpp
Auto-merging src/llmq/quorums_commitment.cpp
Auto-merging src/llmq/quorums_blockprocessor.cpp
Auto-merging src/init.cpp
CONFLICT (content): Merge conflict in src/init.cpp
Auto-merging src/httpserver.cpp
Auto-merging src/governance.cpp
Auto-merging src/governance-vote.h
CONFLICT (content): Merge conflict in src/governance-vote.h
Auto-merging src/evo/providertx.cpp
CONFLICT (content): Merge conflict in src/evo/providertx.cpp
Auto-merging src/evo/deterministicmns.cpp
Removing src/crypto/pobh.h
Removing src/crypto/pobh.c
Auto-merging src/consensus/params.h
Auto-merging src/clientversion.h
CONFLICT (content): Merge conflict in src/clientversion.h
Auto-merging src/clientversion.cpp
CONFLICT (content): Merge conflict in src/clientversion.cpp
Auto-merging src/chainparams.cpp
CONFLICT (content): Merge conflict in src/chainparams.cpp
Auto-merging src/activemasternode.cpp
CONFLICT (add/add): Merge conflict in qa/rpc-tests/llmq-is-retroactive.py
Auto-merging qa/rpc-tests/llmq-is-retroactive.py
Removing qa/pull-tester/tests_config.py.in
Auto-merging contrib/masternode-install.sh
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Automatic merge failed; fix conflicts and then commit the result.
And after that compilation is not working:
CXX biblepayd-biblepayd.o
In file included from protocol.h:16,
from chainparams.h:12,
from biblepayd.cpp:11:
version.h:14:1: error: version control conflict marker in file
14 | <<<<<<< HEAD
| ^~~~~~~
version.h:16:1: error: version control conflict marker in file
16 | =======
| ^~~~~~~
version.h:18:1: error: version control conflict marker in file
18 | >>>>>>> 8e419161e1eab114e448fc791dc224cdbc97036e
| ^~~~~~~
version.h:27:1: error: version control conflict marker in file
27 | <<<<<<< HEAD
| ^~~~~~~
version.h:29:1: error: version control conflict marker in file
29 | =======
| ^~~~~~~
version.h:31:1: error: version control conflict marker in file
31 | >>>>>>> 8e419161e1eab114e448fc791dc224cdbc97036e
| ^~~~~~~
gmake[2]: *** [Makefile:10898: biblepayd-biblepayd.o] Error 1
gmake[2]: Leaving directory '/home/ovi/wallets/biblepay/biblepay-develop/biblepay-evolution/src'
gmake[1]: *** [Makefile:12213: all-recursive] Error 1
gmake[1]: Leaving directory '/home/ovi/wallets/biblepay/biblepay-develop/biblepay-evolution/src'
gmake: *** [Makefile:686: all-recursive] Error 1