Skip to content
Snippets Groups Projects
Commit 4376719d authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

CI: adjust auto merge strategy

parent e48bd042
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.ci/test_template.sh
+ 1
− 1
View file @ 4376719d
...@@ -9,7 +9,7 @@ set -e ...@@ -9,7 +9,7 @@ set -e
# which gitlab CE does not currently do for us. # which gitlab CE does not currently do for us.
if [[ "$CI_PROJECT_PATH" != "$UPSTREAM_PROJECT" ]]; then if [[ "$CI_PROJECT_PATH" != "$UPSTREAM_PROJECT" ]]; then
git fetch upstream; git fetch upstream;
git merge --no-commit --no-ff upstream/master; git merge --no-commit --no-ff -s recursive -X ours upstream/master;
fi; fi;
source /test.venv/bin/activate source /test.venv/bin/activate
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment