phrase 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f05b092cf94291d6805c4a9c66aab1d2aa061c6cb4be7855acb0c5cf1c3161
-  data.tar.gz: b34128655c5e36defe2a699c1a3ada9caeb49bd2b21abfbf268fbc094e97e8f1
+  metadata.gz: a6012867c26a4c63c0e1a9e93d0d27b919f39df642c0ea24270a81e36314b80a
+  data.tar.gz: 4c4a4a80ebcb5b32915d7bffedfc6b43ed94298f5065937275eb37b1f9551bbc
 SHA512:
-  metadata.gz: '09a326a7c4a77449197cd337b1ba6158e2b2692eb4baf4f281d38c39bf6a08043df95ef2dcdf1dfb9067be69b9e96c8f9840409c67467b1e157924ceeeb6502d'
-  data.tar.gz: a928d32a5fcffe11f4df850baa83db850628d9ae0df20f2fa42191792a563ed46556499c3889e3584c21454e389d45ddc6c5f1c1fcae448cb86dabf989e90eb8
+  metadata.gz: b19c4f9dc2ed8382533742011e9502ad21bc677bab7e367c41c53809f81f2bf153d0584aa26e0b51e33208cd3b675c8b80e8543297cf5fa94e1c8236e6f7b93e
+  data.tar.gz: 7fb948e5d7009849057907b874e1cb783b636ff0390cbc0f6558496e5fc16d0912e735215204ba4acfe83e20ea800f378e9b1c185087704e8a30bdb0055a35f7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [4.12.0](https://github.com/phrase/openapi/compare/ruby-v4.11.0...ruby-v4.12.0) (2025-10-16)
+
+
+### Features
+
+* List child branches ([#926](https://github.com/phrase/openapi/issues/926)) ([31d3b57](https://github.com/phrase/openapi/commit/31d3b57e0d1381149409b77c3e236b226cde22a1))
+
+## [4.11.0](https://github.com/phrase/openapi/compare/ruby-v4.10.0...ruby-v4.11.0) (2025-10-01)
+
+
+### Features
+
+* add branch sync endpoint ([#912](https://github.com/phrase/openapi/issues/912)) ([3293917](https://github.com/phrase/openapi/commit/329391757b3f81574448b1b87506b85bfdeb6761))
+
 ## [4.10.0](https://github.com/phrase/openapi/compare/ruby-v4.9.0...ruby-v4.10.0) (2025-09-30)
 
 

data/README.md

@@ -7,7 +7,7 @@ Phrase Strings is a translation management platform for software projects. You c
 ## This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2.0.0
-- Package version: 4.10.0
+- Package version: 4.12.0
 - Build package: org.openapitools.codegen.languages.RubyClientCodegen
 For more information, please visit [https://developers.phrase.com/api/](https://developers.phrase.com/api/)
 
@@ -56,10 +56,10 @@ gem build phrase.gemspec
 Then install the gem locally:
 
 ```shell
-gem install ./phrase-4.10.0.gem
+gem install ./phrase-4.12.0.gem
 ```
 
-(for development, run `gem install --dev ./phrase-4.10.0.gem` to install the development dependencies)
+(for development, run `gem install --dev ./phrase-4.12.0.gem` to install the development dependencies)
 
 ## Getting Started
 
@@ -154,6 +154,7 @@ Class | Method | HTTP request | Description
 *Phrase::BranchesApi* | [**branch_delete**](docs/BranchesApi.md#branch_delete) | **DELETE** /projects/{project_id}/branches/{name} | Delete a branch
 *Phrase::BranchesApi* | [**branch_merge**](docs/BranchesApi.md#branch_merge) | **PATCH** /projects/{project_id}/branches/{name}/merge | Merge a branch
 *Phrase::BranchesApi* | [**branch_show**](docs/BranchesApi.md#branch_show) | **GET** /projects/{project_id}/branches/{name} | Get a single branch
+*Phrase::BranchesApi* | [**branch_sync**](docs/BranchesApi.md#branch_sync) | **PATCH** /projects/{project_id}/branches/{name}/sync | Sync a branch
 *Phrase::BranchesApi* | [**branch_update**](docs/BranchesApi.md#branch_update) | **PATCH** /projects/{project_id}/branches/{name} | Update a branch
 *Phrase::BranchesApi* | [**branches_list**](docs/BranchesApi.md#branches_list) | **GET** /projects/{project_id}/branches | List branches
 *Phrase::CommentReactionsApi* | [**reaction_create**](docs/CommentReactionsApi.md#reaction_create) | **POST** /projects/{project_id}/keys/{key_id}/comments/{comment_id}/reactions | Create a reaction
@@ -435,6 +436,7 @@ Class | Method | HTTP request | Description
  - [Phrase::BranchCreateParameters](docs/BranchCreateParameters.md)
  - [Phrase::BranchMergeParameters](docs/BranchMergeParameters.md)
  - [Phrase::BranchName](docs/BranchName.md)
+ - [Phrase::BranchSyncParameters](docs/BranchSyncParameters.md)
  - [Phrase::BranchUpdateParameters](docs/BranchUpdateParameters.md)
  - [Phrase::Comment](docs/Comment.md)
  - [Phrase::CommentCreateParameters](docs/CommentCreateParameters.md)

data/docs/AutomationsApi.md

@@ -20,6 +20,8 @@ Method | HTTP request | Description
 
 Activate an automation
 
+Activate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
+
 ### Example
 
 ```ruby
@@ -81,7 +83,7 @@ Response<([**Automation**](Automation.md))>
 
 Create an automation
 
-Create a new automation.
+Create a new automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
 
 ### Example
 
@@ -144,6 +146,8 @@ Response<([**Automation**](Automation.md))>
 
 Deactivate an automation
 
+Deactivate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
+
 ### Example
 
 ```ruby
@@ -205,7 +209,7 @@ Response<([**Automation**](Automation.md))>
 
 Destroy automation
 
-Destroy an automation of an account.  This endpoint is only available to accounts with advanced plans or above. 
+Destroy an automation of an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
 
 ### Example
 
@@ -267,7 +271,7 @@ Response<(nil (empty response body))>
 
 Get a single automation
 
-Get details of a single automation.
+Get details of a single automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
 
 ### Example
 
@@ -330,7 +334,7 @@ Response<([**Automation**](Automation.md))>
 
 Update an automation
 
-Update an existing automation.
+Update an existing automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
 
 ### Example
 
@@ -395,7 +399,7 @@ Response<([**Automation**](Automation.md))>
 
 List automations
 
-List all automations for an account.  This endpoint is only available to accounts with advanced plans or above. 
+List all automations for an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
 
 ### Example
 

data/docs/Branch.md

@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **merged_by** | [**UserPreview**](UserPreview.md) |  | [optional] 
 **created_by** | [**UserPreview**](UserPreview.md) |  | [optional] 
 **state** | **String** |  | [optional] 
+**child_branches** | **Array<String>** |  | [optional] 
 
 ## Code Sample
 
@@ -27,7 +28,8 @@ instance = Phrase::Branch.new(base_project_id: null,
                                  merged_at: null,
                                  merged_by: null,
                                  created_by: null,
-                                 state: null)
+                                 state: null,
+                                 child_branches: null)
 ```
 
 

data/docs/BranchMergeParameters.md

@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**strategy** | **String** | strategy used for merge blocking, use_main or use_branch | [optional] 
+**strategy** | **String** | strategy used for merge conflicts, use_main or use_branch | [optional] 
 
 ## Code Sample
 

data/docs/BranchSyncParameters.md

@@ -0,0 +1,17 @@
+# Phrase::BranchSyncParameters
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**strategy** | **String** | strategy used for conflicts, use_main or use_branch | [optional] 
+
+## Code Sample
+
+```ruby
+require 'Phrase'
+
+instance = Phrase::BranchSyncParameters.new(strategy: use_main)
+```
+
+

data/docs/BranchesApi.md

@@ -9,6 +9,7 @@ Method | HTTP request | Description
 [**branch_delete**](BranchesApi.md#branch_delete) | **DELETE** /projects/{project_id}/branches/{name} | Delete a branch
 [**branch_merge**](BranchesApi.md#branch_merge) | **PATCH** /projects/{project_id}/branches/{name}/merge | Merge a branch
 [**branch_show**](BranchesApi.md#branch_show) | **GET** /projects/{project_id}/branches/{name} | Get a single branch
+[**branch_sync**](BranchesApi.md#branch_sync) | **PATCH** /projects/{project_id}/branches/{name}/sync | Sync a branch
 [**branch_update**](BranchesApi.md#branch_update) | **PATCH** /projects/{project_id}/branches/{name} | Update a branch
 [**branches_list**](BranchesApi.md#branches_list) | **GET** /projects/{project_id}/branches | List branches
 
@@ -207,7 +208,7 @@ Response<(nil (empty response body))>
 
 Merge a branch
 
-Merge an existing branch.   *Note: Merging a branch may take several minutes depending on diff size.* 
+Merge an existing branch.  *Note: Merging a branch may take several minutes depending on diff size.* 
 
 ### Example
 
@@ -328,6 +329,70 @@ Response<([**Branch**](Branch.md))>
 - **Accept**: application/json
 
 
+## branch_sync
+
+> branch_sync(project_id, name, branch_sync_parameters, opts)
+
+Sync a branch
+
+Sync an existing branch.  *Note: Only available for branches created with new branching. New branching is currently in private beta* 
+
+### Example
+
+```ruby
+# load the gem
+require 'phrase'
+# setup authorization
+Phrase.configure do |config|
+  # Configure HTTP basic authorization: Basic
+  config.username = 'YOUR USERNAME'
+  config.password = 'YOUR PASSWORD'
+
+  # Configure API key authorization: Token
+  config.api_key['Authorization'] = 'YOUR API KEY'
+  config.api_key_prefix['Authorization'] = 'token'
+end
+
+api_instance = Phrase::BranchesApi.new
+project_id = 'project_id_example' # String | Project ID
+name = 'name_example' # String | name
+branch_sync_parameters = Phrase::BranchSyncParameters.new # BranchSyncParameters | 
+opts = {
+  x_phrase_app_otp: 'x_phrase_app_otp_example' # String | Two-Factor-Authentication token (optional)
+}
+
+begin
+  #Sync a branch
+  api_instance.branch_sync(project_id, name, branch_sync_parameters, opts)
+rescue Phrase::ApiError => e
+  puts "Exception when calling BranchesApi->branch_sync: #{e}"
+end
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **project_id** | **String**| Project ID | 
+ **name** | **String**| name | 
+ **branch_sync_parameters** | [**BranchSyncParameters**](BranchSyncParameters.md)|  | 
+ **x_phrase_app_otp** | **String**| Two-Factor-Authentication token (optional) | [optional] 
+
+### Return type
+
+Response<(nil (empty response body))>
+
+### Authorization
+
+[Basic](../README.md#Basic), [Token](../README.md#Token)
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+
 ## branch_update
 
 > Branch branch_update(project_id, name, branch_update_parameters, opts)

data/docs/KeyCreateParameters.md

@@ -38,7 +38,7 @@ instance = Phrase::KeyCreateParameters.new(branch: my-feature-branch,
                                  data_type: number,
                                  tags: awesome-feature,needs-proofreading,
                                  max_characters_allowed: 140,
-                                 screenshot: [B@164212ad,
+                                 screenshot: [B@6325a546,
                                  remove_screenshot: null,
                                  unformatted: null,
                                  default_translation_content: Default translation content,

data/docs/KeyUpdateParameters.md

@@ -36,7 +36,7 @@ instance = Phrase::KeyUpdateParameters.new(branch: my-feature-branch,
                                  data_type: number,
                                  tags: awesome-feature,needs-proofreading,
                                  max_characters_allowed: 140,
-                                 screenshot: [B@1053b20d,
+                                 screenshot: [B@89eab25,
                                  remove_screenshot: null,
                                  unformatted: null,
                                  xml_space_preserve: null,

data/docs/ProjectCreateParameters.md

@@ -37,7 +37,7 @@ instance = Phrase::ProjectCreateParameters.new(name: My Android Project,
                                  main_format: yml,
                                  media: Python,
                                  shares_translation_memory: true,
-                                 project_image: [B@27a9fe9e,
+                                 project_image: [B@31b5db46,
                                  remove_project_image: null,
                                  account_id: abcd1234,
                                  point_of_contact: abcd1234,

data/docs/ProjectUpdateParameters.md

@@ -39,7 +39,7 @@ instance = Phrase::ProjectUpdateParameters.new(account_id: abcd1234,
                                  main_format: yml,
                                  media: Python,
                                  shares_translation_memory: true,
-                                 project_image: [B@6cfd4d4d,
+                                 project_image: [B@78026a45,
                                  remove_project_image: false,
                                  workflow: review,
                                  machine_translation_enabled: true,

data/docs/ScreenshotUpdateParameters.md

@@ -17,7 +17,7 @@ require 'Phrase'
 instance = Phrase::ScreenshotUpdateParameters.new(branch: my-feature-branch,
                                  name: A screenshot name,
                                  description: A screenshot description,
-                                 filename: [B@7e775ef3)
+                                 filename: [B@7c553e61)
 ```
 
 

data/lib/phrase/api/automations_api.rb

@@ -8,6 +8,7 @@ module Phrase
       @api_client = api_client
     end
     # Activate an automation
+    # Activate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -19,6 +20,7 @@ module Phrase
     end
 
     # Activate an automation
+    # Activate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -78,7 +80,7 @@ module Phrase
     end
 
     # Create an automation
-    # Create a new automation.
+    # Create a new automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param automations_create_parameters [AutomationsCreateParameters] 
     # @param [Hash] opts the optional parameters
@@ -90,7 +92,7 @@ module Phrase
     end
 
     # Create an automation
-    # Create a new automation.
+    # Create a new automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param automations_create_parameters [AutomationsCreateParameters] 
     # @param [Hash] opts the optional parameters
@@ -152,6 +154,7 @@ module Phrase
     end
 
     # Deactivate an automation
+    # Deactivate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -163,6 +166,7 @@ module Phrase
     end
 
     # Deactivate an automation
+    # Deactivate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -222,7 +226,7 @@ module Phrase
     end
 
     # Destroy automation
-    # Destroy an automation of an account.  This endpoint is only available to accounts with advanced plans or above. 
+    # Destroy an automation of an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -234,7 +238,7 @@ module Phrase
     end
 
     # Destroy automation
-    # Destroy an automation of an account.  This endpoint is only available to accounts with advanced plans or above. 
+    # Destroy an automation of an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -292,7 +296,7 @@ module Phrase
     end
 
     # Get a single automation
-    # Get details of a single automation.
+    # Get details of a single automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -304,7 +308,7 @@ module Phrase
     end
 
     # Get a single automation
-    # Get details of a single automation.
+    # Get details of a single automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param [Hash] opts the optional parameters
@@ -364,7 +368,7 @@ module Phrase
     end
 
     # Update an automation
-    # Update an existing automation.
+    # Update an existing automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param automations_create_parameters1 [AutomationsCreateParameters1] 
@@ -377,7 +381,7 @@ module Phrase
     end
 
     # Update an automation
-    # Update an existing automation.
+    # Update an existing automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param id [String] ID
     # @param automations_create_parameters1 [AutomationsCreateParameters1] 
@@ -444,7 +448,7 @@ module Phrase
     end
 
     # List automations
-    # List all automations for an account.  This endpoint is only available to accounts with advanced plans or above. 
+    # List all automations for an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
@@ -457,7 +461,7 @@ module Phrase
     end
 
     # List automations
-    # List all automations for an account.  This endpoint is only available to accounts with advanced plans or above. 
+    # List all automations for an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
     # @param account_id [String] Account ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)

data/lib/phrase/api/branches_api.rb

@@ -222,7 +222,7 @@ module Phrase
     end
 
     # Merge a branch
-    # Merge an existing branch.   *Note: Merging a branch may take several minutes depending on diff size.* 
+    # Merge an existing branch.  *Note: Merging a branch may take several minutes depending on diff size.* 
     # @param project_id [String] Project ID
     # @param name [String] name
     # @param branch_merge_parameters [BranchMergeParameters] 
@@ -235,7 +235,7 @@ module Phrase
     end
 
     # Merge a branch
-    # Merge an existing branch.   *Note: Merging a branch may take several minutes depending on diff size.* 
+    # Merge an existing branch.  *Note: Merging a branch may take several minutes depending on diff size.* 
     # @param project_id [String] Project ID
     # @param name [String] name
     # @param branch_merge_parameters [BranchMergeParameters] 
@@ -371,6 +371,84 @@ module Phrase
       return response, status_code, headers
     end
 
+    # Sync a branch
+    # Sync an existing branch.  *Note: Only available for branches created with new branching. New branching is currently in private beta* 
+    # @param project_id [String] Project ID
+    # @param name [String] name
+    # @param branch_sync_parameters [BranchSyncParameters] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
+    # @return [nil]
+    def branch_sync(project_id, name, branch_sync_parameters, opts = {})
+      data, _status_code, _headers = branch_sync_with_http_info(project_id, name, branch_sync_parameters, opts)
+      data
+    end
+
+    # Sync a branch
+    # Sync an existing branch.  *Note: Only available for branches created with new branching. New branching is currently in private beta* 
+    # @param project_id [String] Project ID
+    # @param name [String] name
+    # @param branch_sync_parameters [BranchSyncParameters] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
+    # @return [Array<(Response, Integer, Hash)>] Response<(nil, response status code and response headers
+    def branch_sync_with_http_info(project_id, name, branch_sync_parameters, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: BranchesApi.branch_sync ...'
+      end
+      # verify the required parameter 'project_id' is set
+      if @api_client.config.client_side_validation && project_id.nil?
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling BranchesApi.branch_sync"
+      end
+      # verify the required parameter 'name' is set
+      if @api_client.config.client_side_validation && name.nil?
+        fail ArgumentError, "Missing the required parameter 'name' when calling BranchesApi.branch_sync"
+      end
+      # verify the required parameter 'branch_sync_parameters' is set
+      if @api_client.config.client_side_validation && branch_sync_parameters.nil?
+        fail ArgumentError, "Missing the required parameter 'branch_sync_parameters' when calling BranchesApi.branch_sync"
+      end
+      # resource path
+      local_var_path = '/projects/{project_id}/branches/{name}/sync'.sub('{' + 'project_id' + '}', CGI.escape(project_id.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      header_params[:'X-PhraseApp-OTP'] = opts[:'x_phrase_app_otp'] if !opts[:'x_phrase_app_otp'].nil?
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:body] || @api_client.object_to_http_body(branch_sync_parameters) 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['Basic', 'Token']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: BranchesApi#branch_sync\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      response = ::Phrase::Response.new(data, headers)
+      return response, status_code, headers
+    end
+
     # Update a branch
     # Update an existing branch.
     # @param project_id [String] Project ID

data/lib/phrase/models/branch.rb

@@ -20,6 +20,8 @@ module Phrase
 
     attr_accessor :state
 
+    attr_accessor :child_branches
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -31,7 +33,8 @@ module Phrase
         :'merged_at' => :'merged_at',
         :'merged_by' => :'merged_by',
         :'created_by' => :'created_by',
-        :'state' => :'state'
+        :'state' => :'state',
+        :'child_branches' => :'child_branches'
       }
     end
 
@@ -46,7 +49,8 @@ module Phrase
         :'merged_at' => :'DateTime',
         :'merged_by' => :'UserPreview',
         :'created_by' => :'UserPreview',
-        :'state' => :'String'
+        :'state' => :'String',
+        :'child_branches' => :'Array<String>'
       }
     end
 
@@ -106,6 +110,12 @@ module Phrase
       if attributes.key?(:'state')
         self.state = attributes[:'state']
       end
+
+      if attributes.key?(:'child_branches')
+        if (value = attributes[:'child_branches']).is_a?(Array)
+          self.child_branches = value
+        end
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -134,7 +144,8 @@ module Phrase
           merged_at == o.merged_at &&
           merged_by == o.merged_by &&
           created_by == o.created_by &&
-          state == o.state
+          state == o.state &&
+          child_branches == o.child_branches
     end
 
     # @see the `==` method
@@ -146,7 +157,7 @@ module Phrase
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [base_project_id, branch_project_id, name, created_at, updated_at, merged_at, merged_by, created_by, state].hash
+      [base_project_id, branch_project_id, name, created_at, updated_at, merged_at, merged_by, created_by, state, child_branches].hash
     end
 
     # Builds the object from hash

data/lib/phrase/models/branch_merge_parameters.rb

@@ -2,7 +2,7 @@ require 'date'
 
 module Phrase
   class BranchMergeParameters
-    # strategy used for merge blocking, use_main or use_branch
+    # strategy used for merge conflicts, use_main or use_branch
     attr_accessor :strategy
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/phrase/models/branch_sync_parameters.rb

@@ -0,0 +1,197 @@
+require 'date'
+
+module Phrase
+  class BranchSyncParameters
+    # strategy used for conflicts, use_main or use_branch
+    attr_accessor :strategy
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'strategy' => :'strategy'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'strategy' => :'String'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Phrase::BranchSyncParameters` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Phrase::BranchSyncParameters`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:'strategy')
+        self.strategy = attributes[:'strategy']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          strategy == o.strategy
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [strategy].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :Time
+        Time.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        Phrase.const_get(type).build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = '4.10.0'
+  VERSION = '4.12.0'
 end

data/lib/phrase.rb

@@ -27,6 +27,7 @@ require 'phrase/models/branch'
 require 'phrase/models/branch_create_parameters'
 require 'phrase/models/branch_merge_parameters'
 require 'phrase/models/branch_name'
+require 'phrase/models/branch_sync_parameters'
 require 'phrase/models/branch_update_parameters'
 require 'phrase/models/comment'
 require 'phrase/models/comment_create_parameters'

data/spec/api/automations_api_spec.rb

@@ -22,6 +22,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_activate
   # Activate an automation
+  # Activate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param id ID
   # @param [Hash] opts the optional parameters
@@ -35,7 +36,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_create
   # Create an automation
-  # Create a new automation.
+  # Create a new automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param automations_create_parameters 
   # @param [Hash] opts the optional parameters
@@ -49,6 +50,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_deactivate
   # Deactivate an automation
+  # Deactivate an automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param id ID
   # @param [Hash] opts the optional parameters
@@ -62,7 +64,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_delete
   # Destroy automation
-  # Destroy an automation of an account.  This endpoint is only available to accounts with advanced plans or above. 
+  # Destroy an automation of an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param id ID
   # @param [Hash] opts the optional parameters
@@ -76,7 +78,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_show
   # Get a single automation
-  # Get details of a single automation.
+  # Get details of a single automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param id ID
   # @param [Hash] opts the optional parameters
@@ -90,7 +92,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automation_update
   # Update an automation
-  # Update an existing automation.
+  # Update an existing automation.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param id ID
   # @param automations_create_parameters1 
@@ -105,7 +107,7 @@ describe 'AutomationsApi' do
 
   # unit tests for automations_list
   # List automations
-  # List all automations for an account.  This endpoint is only available to accounts with advanced plans or above. 
+  # List all automations for an account.  For feature availability, see [Jobs (Strings)](https://support.phrase.com/hc/en-us/articles/5784100517788-Jobs-Strings). 
   # @param account_id Account ID
   # @param [Hash] opts the optional parameters
   # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)

data/spec/api/branches_api_spec.rb

@@ -64,7 +64,7 @@ describe 'BranchesApi' do
 
   # unit tests for branch_merge
   # Merge a branch
-  # Merge an existing branch.   *Note: Merging a branch may take several minutes depending on diff size.* 
+  # Merge an existing branch.  *Note: Merging a branch may take several minutes depending on diff size.* 
   # @param project_id Project ID
   # @param name name
   # @param branch_merge_parameters 
@@ -91,6 +91,21 @@ describe 'BranchesApi' do
     end
   end
 
+  # unit tests for branch_sync
+  # Sync a branch
+  # Sync an existing branch.  *Note: Only available for branches created with new branching. New branching is currently in private beta* 
+  # @param project_id Project ID
+  # @param name name
+  # @param branch_sync_parameters 
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :x_phrase_app_otp Two-Factor-Authentication token (optional)
+  # @return [nil]
+  describe 'branch_sync test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   # unit tests for branch_update
   # Update a branch
   # Update an existing branch.

data/spec/models/branch_spec.rb

@@ -74,4 +74,10 @@ describe 'Branch' do
     end
   end
 
+  describe 'test attribute "child_branches"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
 end

data/spec/models/branch_sync_parameters_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Phrase::BranchSyncParameters
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe 'BranchSyncParameters' do
+  before do
+    # run before each test
+    @instance = Phrase::BranchSyncParameters.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of BranchSyncParameters' do
+    it 'should create an instance of BranchSyncParameters' do
+      expect(@instance).to be_instance_of(Phrase::BranchSyncParameters)
+    end
+  end
+  describe 'test attribute "strategy"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.12.0
 platform: ruby
 authors:
 - Phrase
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-30 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -101,6 +101,7 @@ files:
 - docs/BranchCreateParameters.md
 - docs/BranchMergeParameters.md
 - docs/BranchName.md
+- docs/BranchSyncParameters.md
 - docs/BranchUpdateParameters.md
 - docs/BranchesApi.md
 - docs/Comment.md
@@ -432,6 +433,7 @@ files:
 - lib/phrase/models/branch_create_parameters.rb
 - lib/phrase/models/branch_merge_parameters.rb
 - lib/phrase/models/branch_name.rb
+- lib/phrase/models/branch_sync_parameters.rb
 - lib/phrase/models/branch_update_parameters.rb
 - lib/phrase/models/comment.rb
 - lib/phrase/models/comment_create_parameters.rb
@@ -711,6 +713,7 @@ files:
 - spec/models/branch_merge_parameters_spec.rb
 - spec/models/branch_name_spec.rb
 - spec/models/branch_spec.rb
+- spec/models/branch_sync_parameters_spec.rb
 - spec/models/branch_update_parameters_spec.rb
 - spec/models/comment_create_parameters1_spec.rb
 - spec/models/comment_create_parameters_spec.rb
@@ -1182,6 +1185,7 @@ test_files:
 - spec/models/job_locale_complete_review_parameters_spec.rb
 - spec/models/screenshot_marker_update_parameters_spec.rb
 - spec/models/distribution_create_parameters_spec.rb
+- spec/models/branch_sync_parameters_spec.rb
 - spec/models/quality_performance_score_list_request_spec.rb
 - spec/models/distribution_update_parameters_spec.rb
 - spec/models/affected_count_spec.rb