Skip to content
Snippets Groups Projects
Commit dc7be87c authored by Lukas Schreiner's avatar Lukas Schreiner
Browse files

Update ci

parent b33dfd31
Branches
No related tags found
No related merge requests found
Pipeline #3988 passed
......@@ -39,7 +39,7 @@ sync-job:
script:
- git checkout master
- git reset --hard origin/master
- git pull -u origin
- git pull origin master
- git fetch upstream
- git merge -X theirs --allow-unrelated-histories upstream/master
- *postfix_update_tpl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment