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

FIX #16699 TIME 0:15 reset pull rebase in sync

parent 5bd9e8fb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
.gitlab-ci.yml
+ 3
− 2
View file @ e0967241
...@@ -81,8 +81,9 @@ commits: ...@@ -81,8 +81,9 @@ commits:
- git config --global user.email "$CI_EMAIL" && git config --global user.name "$CI_USER" - git config --global user.email "$CI_EMAIL" && git config --global user.name "$CI_USER"
- 'exists=`git show-ref refs/heads/$CI_COMMIT_REF_NAME` && if [ -n "$exists" ]; then git branch -D $CI_COMMIT_REF_NAME; fi' - 'exists=`git show-ref refs/heads/$CI_COMMIT_REF_NAME` && if [ -n "$exists" ]; then git branch -D $CI_COMMIT_REF_NAME; fi'
- 'if [ -d ".git/rebase-apply" ]; then rm -fr .git/rebase-apply; fi' - 'if [ -d ".git/rebase-apply" ]; then rm -fr .git/rebase-apply; fi'
# - git pull --rebase origin $CI_COMMIT_REF_NAME - git pull --rebase origin $CI_COMMIT_REF_NAME
- git pull -s recursive -X ours --no-edit origin $CI_COMMIT_REF_NAME # Use this pull command if there are merge conflicts during rebase /!\ it will keep the changes in the Pro repository !
# - git pull -s recursive -X theirs --no-edit origin $CI_COMMIT_REF_NAME
- git checkout -b $CI_COMMIT_REF_NAME - git checkout -b $CI_COMMIT_REF_NAME
- git push origin --all - git push origin --all
......
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