MCPcopy Create free account
hub / github.com/libgit2/pygit2 / conflicts

Method conflicts

pygit2/index.py:366–387  ·  view source on GitHub ↗

A collection of conflict information If there are no conflicts None is returned. Otherwise return an object that represents the conflicts in the index. This object presents a mapping interface with the paths as keys. You can use the ``del`` operator to remove a conf

(self)

Source from the content-addressed store, hash-verified

364
365 @property
366 def conflicts(self):
367 """A collection of conflict information
368
369 If there are no conflicts None is returned. Otherwise return an object
370 that represents the conflicts in the index.
371
372 This object presents a mapping interface with the paths as keys. You
373 can use the ``del`` operator to remove a conflict from the Index.
374
375 Each conflict is made up of three elements. Access or iteration
376 of the conflicts returns a three-tuple of
377 :py:class:`~pygit2.IndexEntry`. The first is the common
378 ancestor, the second is the "ours" side of the conflict, and the
379 third is the "theirs" side.
380
381 These elements may be None depending on which sides exist for
382 the particular conflict.
383 """
384 if not C.git_index_has_conflicts(self._index):
385 return None
386
387 return ConflictCollection(self)
388
389
390@dataclass

Callers

nothing calls this directly

Calls 1

ConflictCollectionClass · 0.85

Tested by

no test coverage detected