Improvement/cldsrv 419 improve coverage test cloudserver
This PR is to improve the use cases and coverage in unit test in cloudserver following this scenarios
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.
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.
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
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.