Update Changelog

CHANGELOG.rst

@@ -3,24 +3,29 @@
 
 - Drop support for Python 3.8
 
-- Add Linux wheels for musl
+- Add Linux wheels for musl on x86_64
   `#1266 <https://github.com/libgit2/pygit2/pull/1266>`_
 
 - New ``Repository.submodules`` namespace
   `#1250 <https://github.com/libgit2/pygit2/pull/1250>`_
 
-- New ``pygit2.enums`` supersedes the ``GIT_`` constants
-  `#1251 <https://github.com/libgit2/pygit2/pull/1251>`_
-
 - New ``Repository.listall_mergeheads()``, ``Repository.message``,
   ``Repository.raw_message`` and ``Repository.remove_message()``
   `#1261 <https://github.com/libgit2/pygit2/pull/1261>`_
 
-- Changed now ``Repository.status(...)``, ``Repository.status_file(...)``,
+- New ``pygit2.enums`` supersedes the ``GIT_`` constants
+  `#1251 <https://github.com/libgit2/pygit2/pull/1251>`_
+
+- Now ``Repository.status(...)``, ``Repository.status_file(...)``,
   ``Repository.merge_analysis(...)``, ``DiffFile.flags``, ``DiffFile.mode``,
   ``DiffDelta.flags`` and ``DiffDelta.status`` return enums
   `#1263 <https://github.com/libgit2/pygit2/pull/1263>`_
 
+- Now repository's ``merge(...)``, ``merge_commits(...)`` and
+  ``merge_trees(...)`` take enums/flags for their ``favor``, ``flags`` and
+  ``file_flags`` arguments.
+  `#1271 <https://github.com/libgit2/pygit2/pull/1271>`_
+
 - Fix crash in filter cleanup
   `#1259 <https://github.com/libgit2/pygit2/pull/1259>`_
 
@@ -42,6 +47,9 @@ Deprecations:
 - Deprecate ``Repository.init_submodules(...)``, use ``Repository.submodules.init(...)``
 - Deprecate ``Repository.update_submodule(...)``, use ``Repository.submodules.update(...)``
 - Deprecate ``GIT_*`` constants, use ``pygit2.enums``
+- Passign dicts to repository's ``merge(...)``, ``merge_commits(...)`` and
+  ``merge_trees(...)`` is deprecated. Instead pass ``MergeFavor`` for the ``favor``
+  argument, ``MergeFlag`` for ``flags``, and ``MergeFileFlag`` for ``file_flags``.
 
 
 1.13.3 (2023-11-21)

pygit2/enums.py

@@ -152,7 +152,7 @@ class CheckoutStrategy(IntFlag):
     Allow safe updates that cannot overwrite uncommitted data.
     If the uncommitted changes don't conflict with the checked out files,
     the checkout will still proceed, leaving the changes intact.
-    
+
     Mutually exclusive with FORCE.
     FORCE takes precedence over SAFE.
     """
@@ -292,7 +292,7 @@ class CredentialType(IntFlag):
     An SSH key-based authentication request.
     Allows credentials to be read from memory instead of files.
     Note that because of differences in crypto backend support, it might
-    not be functional. 
+    not be functional.
     """
 
 
@@ -799,7 +799,7 @@ class MergeFavor(IntEnum):
     """
     When a region of a file is changed in both branches, the file created in
     the index will contain the "theirs" side of any conflicting region.
-    
+
     The index will not record a conflict.
     """
 

pygit2/repository.py

@@ -809,7 +809,7 @@ def merge_trees(
         return Index.from_c(self, cindex)
 
     def merge(
-            self, 
+            self,
             id: typing.Union[Oid, str],
             favor = MergeFavor.NORMAL,
             flags = MergeFlag.FIND_RENAMES,