No fast forward

CarbonCommunity · Oct 17, 2023 · 704547b · 704547b
1 parent b09f2d3
commit 704547b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Tools/Build/branch_merge.bat b/Tools/Build/branch_merge.bat
@@ -32,7 +32,7 @@ FOR %%P IN (Carbon.Core/Carbon.Components/Carbon.Bootstrap Carbon.Core/Carbon.Co
 	echo ** Merging '%%P'
 	cd %BOOTSTRAP_ROOT%/%%P
 	git checkout %TO_BRANCH% > NUL
-	git merge origin/%FROM_BRANCH% -m "Merging %FROM_BRANCH% into %TO_BRANCH%" > NUL
+	git merge origin/%FROM_BRANCH% -m "Merging %FROM_BRANCH% into %TO_BRANCH%" --no-ff > NUL
 	git push --set-upstream origin %TO_BRANCH% > NUL
 	echo    done.
 )