SP-1447: fix merge preview conflict reporting and branch docs - #402
Merged
Laberion Ajvazi (LaberionAjvazi) merged 2 commits intoJul 31, 2026
Merged
Conversation
Includes-AI-Code: true
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 91951de. Configure here.
Includes-AI-Code: true
|
Laberion Ajvazi (LaberionAjvazi)
marked this pull request as ready for review
July 30, 2026 11:32
Meris Nici (promeris)
approved these changes
Jul 31, 2026
Laberion Ajvazi (LaberionAjvazi)
deleted the
LaberionAjvazi/sp-1447-fixes
branch
July 31, 2026 13:30
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.
Description
Follow-up fixes for the beta
config branchcommands, found while testing them end to end:merge previewnow counts nodes that conflict structurally, so a merge thatmerge applywould refuse is no longer summarised as clean.--bumpoffersPATCHonly, which is what the API supports.CUSTOMresolution example, and documented thatmerge applyneeds either-for--sourceKeywith--sourceVersion, and thatcreate --sourceVersiondoes not acceptLATEST.Relevant links
Checklist