合入boscore bos - TP-Lab/eos GitHub Wiki

在TP-Lab/eos 上合入boscore/bos代码的操作步骤

一、在TP-Lab/eos上创建bos-v1.0.3分支

git clone [email protected]:TP-Lab/eos.git
git checkout mainnet-1.3.0
git checkout -b bos-v1.0.3
git push origin bos-v1.0.3
git branch --set-upstream-to=origin/bos-v1.0.3 bos-v1.0.3
git pull

二、合入 boscore/bos 的v1.0.3分支

git remote add bos [email protected]:boscore/bos.git
git pull bos v1.0.3
解决冲突.
git add.
git commit -m "merge"
git push origin bos-v1.0.3

三、在 TP-Lab/eos 的bos-v1.0.3分支分叉出 bos-kafkaplugin-v1.0.3，加入TP 的plugin

git checkout -b bos-kafkaplugin-v1.0.3
git push origin bos-kafkaplugin-v1.0.3
git branch --set-upstream-to=origin/bos-kafkaplugin-v1.0.3 bos-kafkaplugin-v1.0.3
rm -rf plugin/kafka_plugin
合入 TP-Lab/kafka_plugin，详见https://github.com/TP-Lab/kafka_plugin
git add .
git commit -m "合入 tp kafka_plugin"
git push origin bos-kafkaplugin-v1.0.3