-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
charts, salt, build: Bump Dex chart to 0.18.0 #4367
Conversation
Hello eg-ayoub,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command:
Alternatively, the |
ace36f2
to
0553b0e
Compare
0553b0e
to
2ccdc57
Compare
/create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/128.0/improvement/bump-dexidp-2.40 origin/development/128.0
$ git merge origin/improvement/bump-dexidp-2.40
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/128.0/improvement/bump-dexidp-2.40 The following options are set: create_integration_branches |
ping |
/approve |
ping |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye eg-ayoub. The following options are set: approve, create_integration_branches |
No description provided.