treeverse · itaigilo · May 29, 2024 · May 23, 2024 · May 27, 2024 · May 28, 2024
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -645,6 +645,11 @@ components:
         force:
           type: boolean
           default: false
+          description: Allow merge into a read-only branch or into a branch with the same content
+        allow_empty:
+          type: boolean
+          default: false
+          description: Allow merge when the branches have the same content
 
     BranchCreation:
       type: object

diff --git a/clients/java-legacy/api/openapi.yaml b/clients/java-legacy/api/openapi.yaml
diff --git a/clients/java-legacy/docs/Merge.md b/clients/java-legacy/docs/Merge.md
diff --git a/clients/java-legacy/src/main/java/io/lakefs/clients/api/model/Merge.java b/clients/java-legacy/src/main/java/io/lakefs/clients/api/model/Merge.java
diff --git a/clients/java-legacy/src/test/java/io/lakefs/clients/api/model/MergeTest.java b/clients/java-legacy/src/test/java/io/lakefs/clients/api/model/MergeTest.java
diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
diff --git a/clients/java/docs/Merge.md b/clients/java/docs/Merge.md
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Merge.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Merge.java
diff --git a/clients/java/src/test/java/io/lakefs/clients/sdk/model/MergeTest.java b/clients/java/src/test/java/io/lakefs/clients/sdk/model/MergeTest.java
diff --git a/clients/python-legacy/docs/Merge.md b/clients/python-legacy/docs/Merge.md
diff --git a/clients/python-legacy/docs/RefsApi.md b/clients/python-legacy/docs/RefsApi.md
diff --git a/clients/python-legacy/lakefs_client/model/merge.py b/clients/python-legacy/lakefs_client/model/merge.py
diff --git a/clients/python/docs/Merge.md b/clients/python/docs/Merge.md
diff --git a/clients/python/lakefs_sdk/models/merge.py b/clients/python/lakefs_sdk/models/merge.py
diff --git a/clients/python/test/test_merge.py b/clients/python/test/test_merge.py
diff --git a/clients/rust/docs/Merge.md b/clients/rust/docs/Merge.md
diff --git a/clients/rust/src/models/merge.rs b/clients/rust/src/models/merge.rs