Avoid merge conflict during version bump#30
Merged
Conversation
labkey-klum
approved these changes
Jul 21, 2026
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
2 participants
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.
Rationale
When releasing 26.7.1, the automated product version bump hit a merge conflict.
labkeyVersionandlabkeyClientApiVersionare defined on adjacent lines so there was a conflict whenrelease26.7had a change to the product version andrelease26.7-SNAPSHOThad a change to the api version.We can use the
-Xtheirsmerge strategy to prevent conflicts during the version bump. The non-snapshot release branches have no unique changes that we need to retain. Only thelabkeyVersionproperty is changed and it will always be updated to the correct value after the merge is performed.Related Pull Requests
Changes
-Xtheirsstrategy to avoid merge conflicts during version bump.claudedirectory