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.

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

ARSN-392 version bump #2225

Merged
merged 1 commit into from
Feb 21, 2024
Merged

ARSN-392 version bump #2225

merged 1 commit into from
Feb 21, 2024

Conversation

nicolas2bert
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

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 Feb 21, 2024

Incorrect fix version

The Fix Version/s in issue ARSN-392 contains:

  • 7.70.26

  • 8.1.124

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.59

  • 7.70.26

  • 8.1.124

Please check the Fix Version/s of ARSN-392, or the target
branch of this pull request.

@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@nicolas2bert
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/ARSN-392/bump with contents from bugfix/ARSN-392/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/ARSN-392/bump origin/development/7.70
 $ git merge origin/bugfix/ARSN-392/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/ARSN-392/bump

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

Conflict

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

I have not created the integration branch.

Here are the steps to resolve this conflict:

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@nicolas2bert
Copy link
Contributor Author

/create_integration_branches

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

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.1

The following branches will NOT be impacted:

  • development/6.4
  • 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, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2024

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue ARSN-392.

Goodbye nicolas2bert.

@bert-e bert-e merged commit f189185 into development/7.10 Feb 21, 2024
6 of 7 checks passed
@bert-e bert-e deleted the bugfix/ARSN-392/bump branch February 21, 2024 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants