fix(import-packages): force merge (--no-ff)

vatesfr · Jul 17, 2019 · 6ce35fd · 6ce35fd
1 parent dabc2d0
commit 6ce35fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/import-packages b/scripts/import-packages
@@ -78,6 +78,6 @@ do
   move_"$move" "$pkg" "packages/$pkg"
 
   # merge and delete master branch
-  git merge --allow-unrelated-histories "$pkg/master"
+  git merge --no-ff --allow-unrelated-histories "$pkg/master"
   git branch -d "$pkg/master"
 done