How to do this, on sles 15 sp4
Part 1: pull the pull request
at this point, you'll see a merge conflict... You'll need to edit src/ini.cpp manually (open it with an editor and look for <<<<<<<)
then, after resolving the merge conflict
Now, you can build
Part 1: pull the pull request
Code:
git clone https://github.com/bitcoin/bitcoin.git
cd bitcoin
git fetch origin pull/29775/head:pr-29775
git checkout pr-29775
git merge origin/master
cd bitcoin
git fetch origin pull/29775/head:pr-29775
git checkout pr-29775
git merge origin/master
at this point, you'll see a merge conflict... You'll need to edit src/ini.cpp manually (open it with an editor and look for <<<<<<<)
then, after resolving the merge conflict
Code:
git add src/init.cpp
git merge --continue
git merge --continue
Now, you can build