Skip to content
Snippets Groups Projects
Commit 6739668e authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FIX #17451 TIME 0:05 fix synchronization to pro repository

parent a06b910f
No related branches found
No related tags found
No related merge requests found
......@@ -86,6 +86,7 @@ commits:
# - git pull --rebase origin $CI_COMMIT_REF_NAME
# Use this pull command if there are merge conflicts during rebase /!\ theirs will keep the changes in the Pro repository ! ours will keep the changes in the normal one
# - git pull -s recursive -X ours --no-edit origin $CI_COMMIT_REF_NAME
- git fetch origin
- git merge --no-commit --no-ff origin/$CI_COMMIT_REF_NAME
- git reset -- dist/
- git commit -m "Removed dist folder"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment