Release 1.18.1

Author: jdavid

AUTHORS.md

@@ -16,6 +16,7 @@ Authors:
     Richo Healey
     Christian Boos
     Julien Miotte
+    Benedikt Seidl
     Nick Hynes
     Richard Möhn
     Xu Tao
@@ -34,6 +35,7 @@ Authors:
     Xavier Delannoy
     Michael Jones
     Saugat Pachhai
+    Andrej730
     Bernardo Heynemann
     John Szakmeister
     Nabijacz Leweli
@@ -66,6 +68,7 @@ Authors:
     Assaf Nativ
     Bob Carroll
     Christian Häggström
+    Edmundo Carmona Antoranz
     Erik Johnson
     Filip Rindler
     Fraser Tweedale
@@ -133,6 +136,7 @@ Authors:
     Albin Söderström
     Alexandru Fikl
     Andrew Chin
+    Andrew McNulty
     Andrey Trubachev
     András Veres-Szentkirályi
     Ash Berlin
@@ -163,7 +167,6 @@ Authors:
     David Six
     Dennis Schwertel
     Devaev Maxim
-    Edmundo Carmona Antoranz
     Eric Davis
     Erik Meusel
     Erik van Zijst
@@ -220,6 +223,7 @@ Authors:
     Rui Chen
     Sandro Jäckel
     Saul Pwanson
+    Sebastian Hamann
     Shane Turner
     Sheeo
     Simone Mosciatti

CHANGELOG.md

@@ -1,10 +1,13 @@
-# 1.18.1 (UNRELEASED)
+# 1.18.1 (2025-07-26)
 
 - Update wheels to libgit2 1.9.1 and OpenSSL 3.3
 
 - New `Index.remove_directory(...)`
   [#1377](https://github.com/libgit2/pygit2/pull/1377)
 
+- New `Index.add_conflict(...)`
+  [#1382](https://github.com/libgit2/pygit2/pull/1382)
+
 - Now `Repository.merge_file_from_index(...)` returns a `MergeFileResult` object when
   called with `use_deprecated=False`
   [#1376](https://github.com/libgit2/pygit2/pull/1376)
@@ -15,6 +18,7 @@
   [#1371](https://github.com/libgit2/pygit2/pull/1371)
   [#1373](https://github.com/libgit2/pygit2/pull/1373)
   [#1384](https://github.com/libgit2/pygit2/pull/1384)
+  [#1386](https://github.com/libgit2/pygit2/pull/1386)
 
 Deprecations:
 

docs/conf.py

@@ -23,7 +23,7 @@
 # author = ''
 
 # The full version, including alpha/beta/rc tags
-release = '1.18.0'
+release = '1.18.1'
 
 
 # -- General configuration ---------------------------------------------------

pygit2/_build.py

@@ -34,7 +34,7 @@
 #
 # The version number of pygit2
 #
-__version__ = '1.18.0'
+__version__ = '1.18.1'
 
 
 #