Skip to content
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.

Sign up for GitHub

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

Jump to bottom

BB-425 bump version #2428

Merged
merged 2 commits into from
Jul 7, 2023
Merged

BB-425 bump version #2428

merged 2 commits into from
Jul 7, 2023

Conversation

nicolas2bert
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Hello nicolas2bert,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Branches have diverged

This pull request's source branch bugfix/BB-425/bump has diverged from
development/8.6 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/8.6 into bugfix/BB-425/bump
  • Rebase bugfix/BB-425/bump onto origin/development/8.6

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@nicolas2bert nicolas2bert changed the base branch from development/8.6 to development/7.10 July 5, 2023 20:54
@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-425/bump with contents from bugfix/BB-425/bump
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/BB-425/bump origin/development/7.70
 $ git merge origin/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-425/bump

@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-425/bump with contents from w/7.70/bugfix/BB-425/bump
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/BB-425/bump origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-425/bump

@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

History mismatch

Merge commit #8f121777322b8bd23b7375be126de5fc9604a855 on the integration branch
w/7.70/bugfix/BB-425/bump is merging a branch which is neither the current
branch bugfix/BB-425/bump nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/BB-425/bump and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@nicolas2bert
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-425/bump with contents from bugfix/BB-425/bump
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/BB-425/bump origin/development/7.70
 $ git merge origin/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-425/bump

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-425/bump with contents from w/7.70/bugfix/BB-425/bump
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/BB-425/bump origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-425/bump

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

History mismatch

Merge commit #9412273c3c780aa3d4c8c964fc29b87705b593d5 on the integration branch
w/7.70/bugfix/BB-425/bump is merging a branch which is neither the current
branch bugfix/BB-425/bump nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/BB-425/bump and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@nicolas2bert
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-425/bump with contents from bugfix/BB-425/bump
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/BB-425/bump origin/development/7.70
 $ git merge origin/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-425/bump

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-425/bump with contents from w/7.70/bugfix/BB-425/bump
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/BB-425/bump origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-425/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-425/bump

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches will NOT be impacted:

  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 7, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue BB-425.

Goodbye nicolas2bert.

@bert-e bert-e merged commit 3fdc25b into development/7.10 Jul 7, 2023
@bert-e bert-e deleted the bugfix/BB-425/bump branch July 7, 2023 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexanderchan-scality alexanderchan-scality alexanderchan-scality approved these changes

@rahulreddy rahulreddy rahulreddy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nicolas2bert @bert-e @rahulreddy @alexanderchan-scality