Merge pull request #48 from merge-api/fern-bot/06-03-2025-0244PM

🌿 Fern Regeneration -- June 3, 2025

Author: niteshsandal-merge

.editorconfig

@@ -0,0 +1,35 @@
+root = true
+
+[*.cs]
+resharper_arrange_object_creation_when_type_evident_highlighting = hint
+resharper_auto_property_can_be_made_get_only_global_highlighting = hint
+resharper_check_namespace_highlighting = hint
+resharper_class_never_instantiated_global_highlighting = hint
+resharper_class_never_instantiated_local_highlighting = hint
+resharper_collection_never_updated_global_highlighting = hint
+resharper_convert_type_check_pattern_to_null_check_highlighting = hint
+resharper_inconsistent_naming_highlighting = hint
+resharper_member_can_be_private_global_highlighting = hint
+resharper_member_hides_static_from_outer_class_highlighting = hint
+resharper_not_accessed_field_local_highlighting = hint
+resharper_nullable_warning_suppression_is_used_highlighting = suggestion
+resharper_partial_type_with_single_part_highlighting = hint
+resharper_prefer_concrete_value_over_default_highlighting = none
+resharper_private_field_can_be_converted_to_local_variable_highlighting = hint
+resharper_property_can_be_made_init_only_global_highlighting = hint
+resharper_property_can_be_made_init_only_local_highlighting = hint
+resharper_redundant_name_qualifier_highlighting = none
+resharper_redundant_using_directive_highlighting = hint
+resharper_replace_slice_with_range_indexer_highlighting = none
+resharper_unused_auto_property_accessor_global_highlighting = hint
+resharper_unused_auto_property_accessor_local_highlighting = hint
+resharper_unused_member_global_highlighting = hint
+resharper_unused_type_global_highlighting = hint
+resharper_use_string_interpolation_highlighting = hint
+dotnet_diagnostic.CS1591.severity = suggestion
+
+[src/**/Types/*.cs]
+resharper_check_namespace_highlighting = none
+
+[src/**/Core/Public/*.cs]
+resharper_check_namespace_highlighting = none

.fernignore

@@ -1,5 +1,14 @@
 # Specify files that shouldn't be modified by Fern
 
-src/Merge.Client/MergeClient.cs
-
 README.md
+
+src/Merge.Client/MergeClient.cs
+src/Merge.Client/Ats/Jobs/JobsClient.cs
+src/Merge.Client/BaseMergeClient.cs
+src/Merge.Client/Crm/AssociationTypes/AssociationTypesClient.cs
+src/Merge.Client/Crm/Associations/AssociationsClient.cs
+src/Merge.Client/Crm/CustomObjects/CustomObjectsClient.cs
+src/Merge.Client/Ticketing/Collections/CollectionsClient.cs
+src/Merge.Client/Ticketing/Projects/ProjectsClient.cs
+src/Merge.Client/Ticketing/Tickets/TicketsClient.cs
+src/Merge.Client/Core/RawClient.cs

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/checkout@master
 
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/checkout@master
 
@@ -54,7 +54,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v1