Skip to content
Snippets Groups Projects
Verified Commit 458f9590 authored by Anton Akhmerov's avatar Anton Akhmerov
Browse files

specify user before merging

parent e0d67c0a
Branches lecture_13
No related tags found
No related merge requests found
Pipeline #14266 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitlab-ci.yml
+ 1
− 1
View file @ 458f9590
...@@ -83,5 +83,5 @@ merge into local: ...@@ -83,5 +83,5 @@ merge into local:
- master@solidstate/lectures - master@solidstate/lectures
script: script:
- git checkout local - git checkout local
- git merge master - git diff-index --quiet master || git -c "user.name=$GITLAB_USER_NAME" -c "user.email=$GITLAB_USER_EMAIL" merge master
- "git push https://$GITLAB_PUSH_KEY@gitlab.kwant-project.org/solidstate/lectures.git local" - "git push https://$GITLAB_PUSH_KEY@gitlab.kwant-project.org/solidstate/lectures.git local"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment