參考:https://github.com/doggy8088/Learn-Git-in-30-days/issues/31
~/docker-pool$ git branch
* docker-kafka
master
~/docker-pool$ git merge docker-kafka
fatal: refusing to merge unrelated histories
~/docker-pool$ git merge --allow-unrelated-histories docker-kafka
Merge made by the 'recursive' strategy.
kafka/Dockerfile | 27 +++++++
kafka/LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++
kafka/scripts/start-kafka.sh | 75 ++++++++++++++++++
kafka/supervisor/kafka.conf | 4 +
kafka/supervisor/zookeeper.conf | 4 +
5 files changed, 311 insertions(+)
create mode 100644 kafka/Dockerfile
create mode 100644 kafka/LICENSE
create mode 100755 kafka/scripts/start-kafka.sh
create mode 100644 kafka/supervisor/kafka.conf
create mode 100644 kafka/supervisor/zookeeper.conf