search

sugarchain-project / yumekawa

[TEST] Yumekawa 2.0 Taproot
MIT License
6 stars 5 forks source link

todo: syncing commits with BTC #14

Open decryp2kanon opened 3 years ago

decryp2kanon commented 3 years ago

pull

https://docs.github.com/en/enterprise/2.13/user/articles/merging-an-upstream-repository-into-your-fork

git checkout master # our master
git pull https://github.com/bitcoin/bitcoin.git master # pull their master

merge

https://docs.github.com/en/enterprise/2.13/user/articles/merging-an-upstream-repository-into-your-fork

git remote add BTC https://github.com/bitcoin/bitcoin.git
git fetch BTC
git checkout master # our master
git merge BTC/master # merge their master into our master

cherry-pick

https://coderwall.com/p/sgpksw/git-cherry-pick-from-another-repository

git remote add BTC https://github.com/bitcoin/bitcoin.git
git fetch BTC
git log BTC/master
git cherry-pick 97fedac

cherry-pick BTC PR

https://github.com/bitcoin/bitcoin/pull/20294
git fetch BTC pull/20294/head:MarcoFalke_2011-ciCirrus
git cherry-pick fa68ee899caa0e029e4aaad1730ebf9882937ae3