Skip to content

CLDSRV-294 bump version to 7.10.19#4855

Merged
bert-e merged 1 commit intodevelopment/7.10from
feature/CLDSRV-294-bump-7.10.19
Nov 4, 2022
Merged

CLDSRV-294 bump version to 7.10.19#4855
bert-e merged 1 commit intodevelopment/7.10from
feature/CLDSRV-294-bump-7.10.19

Conversation

@jonathan-gramain
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Hello jonathan-gramain,

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 Nov 4, 2022

Incorrect fix version

The Fix Version/s in issue CLDSRV-294 contains:

  • None

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

  • 7.10.19

  • 7.70.10

  • 8.4.15

  • 8.5.17

  • 8.6.2

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

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/feature/CLDSRV-294-bump-7.10.19 with contents from w/7.70/feature/CLDSRV-294-bump-7.10.19
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/feature/CLDSRV-294-bump-7.10.19 origin/development/8.4
 $ git merge origin/w/7.70/feature/CLDSRV-294-bump-7.10.19
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/feature/CLDSRV-294-bump-7.10.19

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/feature/CLDSRV-294-bump-7.10.19 with contents from w/8.4/feature/CLDSRV-294-bump-7.10.19
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/feature/CLDSRV-294-bump-7.10.19 origin/development/8.5
 $ git merge origin/w/8.4/feature/CLDSRV-294-bump-7.10.19
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/feature/CLDSRV-294-bump-7.10.19

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/feature/CLDSRV-294-bump-7.10.19 with contents from w/8.5/feature/CLDSRV-294-bump-7.10.19
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/feature/CLDSRV-294-bump-7.10.19 origin/development/8.6
 $ git merge origin/w/8.5/feature/CLDSRV-294-bump-7.10.19
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/feature/CLDSRV-294-bump-7.10.19

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

Waiting for approval

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

  • the author

  • 2 peers

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

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

  • ✔️ development/8.5

  • ✔️ development/8.6

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

@bert-e
Copy link
Contributor

bert-e commented Nov 4, 2022

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue CLDSRV-294.

Goodbye jonathan-gramain.

@bert-e bert-e merged commit bcf3b4a into development/7.10 Nov 4, 2022
@bert-e bert-e deleted the feature/CLDSRV-294-bump-7.10.19 branch November 4, 2022 17:17
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.

5 participants