-
Notifications
You must be signed in to change notification settings - Fork 3
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
ZKUI-423 fix-data-browser-reload-on-token-renewal #700
ZKUI-423 fix-data-browser-reload-on-token-renewal #700
Conversation
Hello jbwatenbergscality,My role is to assist you with the merge of this Status report is not available. |
/approve |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the The following options are set: approve |
/status |
StatusStatus report is not available. The following options are set: approve |
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/2.2/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal origin/development/2.2
$ git merge origin/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.2/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal The following options are set: approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: approve |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue ZKUI-423. Goodbye jbwatenbergscality. |
No description provided.