From 7f7b47611d02245a305bd9adaae1390a3872bd54 Mon Sep 17 00:00:00 2001 From: karenzshea Date: Mon, 3 Oct 2016 13:51:30 -0400 Subject: [PATCH] add note about dangers of post subtree merges rebases [skip ci] --- scripts/update_dependencies.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/update_dependencies.sh b/scripts/update_dependencies.sh index b3e487f1c..7b2398af3 100755 --- a/scripts/update_dependencies.sh +++ b/scripts/update_dependencies.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# Note: once the subtree merge from this script has been committed and pushed to +# a branch do not attempt to rebase the branch back onto master or the subdirectory +# structure will be lost. +# http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html + OSMIUM_REPO=https://github.com/osmcode/libosmium.git OSMIUM_TAG=v2.9.0