| | 1 | = 2018-09-13 = |
| | 2 | |
| | 3 | == Git == |
| | 4 | |
| | 5 | * merge 遇到 `fatal: refusing to merge unrelated histories` 錯誤訊息 |
| | 6 | * 原因：從 git 2.9.0 開始預設行為不允許合併沒有共同祖先的分支。你需要加上 --allow-unrelated-histories 選項才不會出現這個錯誤訊息。 |
| | 7 | * 參考：https://github.com/doggy8088/Learn-Git-in-30-days/issues/31 |
| | 8 | {{{ |
| | 9 | ~/docker-pool$ git branch |
| | 10 | * docker-kafka |
| | 11 | master |
| | 12 | ~/docker-pool$ git merge docker-kafka |
| | 13 | fatal: refusing to merge unrelated histories |
| | 14 | ~/docker-pool$ git merge --allow-unrelated-histories docker-kafka |
| | 15 | Merge made by the 'recursive' strategy. |
| | 16 | kafka/Dockerfile | 27 +++++++ |
| | 17 | kafka/LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++ |
| | 18 | kafka/scripts/start-kafka.sh | 75 ++++++++++++++++++ |
| | 19 | kafka/supervisor/kafka.conf | 4 + |
| | 20 | kafka/supervisor/zookeeper.conf | 4 + |
| | 21 | 5 files changed, 311 insertions(+) |
| | 22 | create mode 100644 kafka/Dockerfile |
| | 23 | create mode 100644 kafka/LICENSE |
| | 24 | create mode 100755 kafka/scripts/start-kafka.sh |
| | 25 | create mode 100644 kafka/supervisor/kafka.conf |
| | 26 | create mode 100644 kafka/supervisor/zookeeper.conf |
| | 27 | }}} |
