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

CLDSRV-444: unit test with Id and arsenal version #5333

Draft
wants to merge 5 commits into
base: development/7.10
Choose a base branch
from

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Sep 13, 2023

Description

Motivation and context

In this PR new unit tests were added to test the support of the Id definition and the arsenal version updated for that matter

Checklist

Add tests to cover the changes

New tests added

@bert-e
Copy link
Contributor

bert-e commented Sep 13, 2023

Hello benzekrimaha,

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.

@benzekrimaha benzekrimaha changed the base branch from development/8.7 to development/7.10 September 13, 2023 06:31
@bert-e
Copy link
Contributor

bert-e commented Sep 13, 2023

Branches have diverged

This pull request's source branch bugfix/CLDSRV-444-id-on-resource-policy has diverged from
development/8.7 by more than 50 commits.

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

  • Merge origin/development/8.7 into bugfix/CLDSRV-444-id-on-resource-policy
  • Rebase bugfix/CLDSRV-444-id-on-resource-policy onto origin/development/8.7

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

@bert-e
Copy link
Contributor

bert-e commented Sep 13, 2023

Incorrect fix version

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

  • None

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

  • 7.10.31

  • 7.70.25

  • 8.6.11

  • 8.7.29

  • 8.8.1

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

@benzekrimaha
Copy link
Contributor Author

ping

1 similar comment
@benzekrimaha
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Sep 13, 2023

Conflict

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

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.

None yet

2 participants