APP-5197 - Add --conflict-resolution flag to version-create command#90
Open
danielreJfrog wants to merge 2 commits into
Open
APP-5197 - Add --conflict-resolution flag to version-create command#90danielreJfrog wants to merge 2 commits into
danielreJfrog wants to merge 2 commits into
Conversation
Pass conflict_resolution query parameter to AppTrust API when creating application versions. Supports 'automatic' and 'manual' values. Co-authored-by: Cursor <cursoragent@cursor.com>
Tests are skipped until the platform version with conflict_resolution support is released. Covers automatic, manual, and invalid value scenarios. Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
--conflict-resolutionflag tojf apptrust version-createcommandautomatic(Artifactory picks newest artifact) ormanual(rejects if conflicts exist)conflict_resolutionquery parameter to the AppTrust APITest plan
CreateAppVersionservice (3 new cases: automatic, manual, empty)--conflict-resolution=automaticon a real serverMade with Cursor