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

Improvement/cldsrv 419 improve coverage test cloudserver #5251

Open
wants to merge 1 commit into
base: development/7.10
Choose a base branch
from

Conversation

crtovar
Copy link

@crtovar crtovar commented Jul 25, 2023

This PR is to improve the use cases and coverage in unit test in cloudserver following this scenarios
2a7dea49-663e-4a68-b44d-a8443037978a

@bert-e
Copy link
Contributor

bert-e commented Jul 25, 2023

Hello crtovar,

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 25, 2023

Incorrect fix version

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

  • 7.10.29

  • 7.70.24

  • 8.6.20

  • 8.7.26

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

  • 7.10.29

  • 7.70.24

  • 8.6.10

  • 8.7.26

  • 8.8.1

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

@rahulreddy rahulreddy force-pushed the improvement/CLDSRV-419-improve-coverage-test-cloudserver branch 2 times, most recently from f95d6a8 to c4092ea Compare July 27, 2023 18:18
@bert-e
Copy link
Contributor

bert-e commented Jul 27, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-419-improve-coverage-test-cloudserver with contents from w/7.70/improvement/CLDSRV-419-improve-coverage-test-cloudserver
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/improvement/CLDSRV-419-improve-coverage-test-cloudserver origin/development/8.6
 $ git merge origin/w/7.70/improvement/CLDSRV-419-improve-coverage-test-cloudserver
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-419-improve-coverage-test-cloudserver

@rahulreddy rahulreddy force-pushed the improvement/CLDSRV-419-improve-coverage-test-cloudserver branch from c4092ea to cc21581 Compare September 21, 2023 15:45
@bert-e
Copy link
Contributor

bert-e commented Sep 21, 2023

History mismatch

Merge commit #c4092eac6d35a62afdfd7ee9d43bae1f8a4f715f on the integration branch
w/7.70/improvement/CLDSRV-419-improve-coverage-test-cloudserver is merging a branch which is neither the current
branch improvement/CLDSRV-419-improve-coverage-test-cloudserver nor the development branch
development/7.70.

It is likely due to a rebase of the branch improvement/CLDSRV-419-improve-coverage-test-cloudserver 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.

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.

2 participants