Fix CHANGELOG.md merge conflicts #257
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
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR resolves Git merge conflicts in the CHANGELOG.md file by removing conflict markers and properly organizing the Unreleased section according to Keep a Changelog format.
Key Changes:
- Removed Git conflict markers (
<<<<<<<,=======,>>>>>>>) - Reorganized Unreleased section with proper subsections (Added and Fixed)
- Consolidated four bug fixes into the Fixed subsection
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- 14.3.3: nullable Field and Roles schemas fix - 14.3.2: filesApi.downloadFile fix - 14.3.1: FieldResponse schema fix (GetField) - 14.3.0: is_archived field addition - 14.2.1: OAuth v2 Configuration fix Resolved merge conflicts and distributed all changes to their correct versions. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
youssef-saber-3
approved these changes
Nov 19, 2025
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.
Summary
Changes
<<<<<<< HEAD,=======, and>>>>>>> origin/masterconflict markersis_archivedfield addition to proper Added sectionTest plan
🤖 Generated with Claude Code