Skip to content

feat: Add acceptSourceChanges in request of Merge Branch API#120

Merged
andrii-bodnar merged 1 commit intocrowdin:mainfrom
RyanCarlisle:feat/acceptSourceChanges-merge-API
Oct 28, 2025
Merged

feat: Add acceptSourceChanges in request of Merge Branch API#120
andrii-bodnar merged 1 commit intocrowdin:mainfrom
RyanCarlisle:feat/acceptSourceChanges-merge-API

Conversation

@RyanCarlisle
Copy link
Contributor

Fixes #116

@RyanCarlisle RyanCarlisle changed the title Add acceptSourceChanges in request of Merge Branch API feat: Add acceptSourceChanges in request of Merge Branch API Oct 28, 2025
@codecov-commenter
Copy link

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.21%. Comparing base (927bd62) to head (7e3bbb8).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #120      +/-   ##
==========================================
+ Coverage   97.99%   98.21%   +0.23%     
==========================================
  Files          68       68              
  Lines        4213     3296     -917     
==========================================
- Hits         4128     3237     -891     
+ Misses         59       33      -26     
  Partials       26       26              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@andrii-bodnar andrii-bodnar requested a review from Copilot October 28, 2025 15:23
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds support for the acceptSourceChanges field in the Crowdin Merge Branch API request, addressing issue #116.

Key Changes:

  • Added AcceptSourceChanges field to BranchesMergeRequest and BranchMerge structures
  • Updated test cases to verify the new field is properly serialized and deserialized

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
crowdin/model/branches.go Added AcceptSourceChanges field to both BranchMerge and BranchesMergeRequest structures with JSON tags
crowdin/model/branches_test.go Updated validation test to include the new field in a valid request
crowdin/branches_test.go Updated test cases to verify serialization/deserialization of AcceptSourceChanges in merge and status check operations

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link
Member

@andrii-bodnar andrii-bodnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RyanCarlisle thank you!

@andrii-bodnar andrii-bodnar merged commit 0198054 into crowdin:main Oct 28, 2025
3 of 4 checks passed
@andrii-bodnar
Copy link
Member

andrii-bodnar commented Oct 29, 2025

@RyanCarlisle please also make a follow-up PR to address the missing change mentioned here - crowdin/crowdin-api-client-js#581 (review)

@RyanCarlisle
Copy link
Contributor Author

RyanCarlisle commented Oct 29, 2025

@andrii-bodnar I've already added AcceptSourceChanges in the BranchMerge struct. Please check and let me know whether that is alright

@andrii-bodnar
Copy link
Member

@RyanCarlisle I missed it, sorry for the confusion!

@RyanCarlisle
Copy link
Contributor Author

not a problem, cheers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add support for acceptSourceChanges parameter in Merge Branch API

4 participants