fix: correctly handle merges when 'current' is null #4153
Merged
Conversation
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
Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk>
garethjevans force-pushed the fix-for-merge branch from c9d2db9 to 0c99a19 Compare 
| @garethjevans Could you provide a bit more detail on this change? Is there a corresponding GH issue? If not, can you be a bit more elaborate on the commit message for the motivations behind this change? Thanks! |
spring-builds pushed a commit that referenced this pull request Aug 15, 2025
scionaltera pushed a commit to scionaltera/spring-ai that referenced this pull request Sep 3, 2025
…4153) Fixes spring-projects#4153 Auto-cherry-pick to 1.0.x Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk>
chedim pushed a commit to couchbaselabs/spring-ai that referenced this pull request Sep 19, 2025
…4153) Fixes spring-projects#4153 Auto-cherry-pick to 1.0.x Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk>
Willam2004 pushed a commit to Willam2004/spring-ai that referenced this pull request Oct 11, 2025
…4153) Fixes spring-projects#4153 Auto-cherry-pick to 1.0.x Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 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.
No description provided.