Git::Raw::Index::Conflict(3pm)

Git::Raw::Index::Conflict3pm

Git index conflict class

Version

version 0.90

Overview

A Git::Raw::Index::Conflict represents a conflict in a Git repository index.

WARNING: The API of this module is unstable and may change without warning (any change will be appropriately documented in the changelog).

Methods

ours( )

Retrieve our side of the conflict. Returns a Git::Raw::Index::Entry object, or "undef" if not applicable.

ancestor( )

Retrieve the ancestor side of the conflict. Returns a Git::Raw::Index::Entry object, or "undef" if not applicable.

theirs( )

Retrieve their side of the conflict. Returns a Git::Raw::Index::Entry object, or "undef" if not applicable.

Releases

4 releases since Debian 10 (Buster); the text changed 3 times.

  1. 10
  2. 11
  3. 12
  4. 13

Author

Jacques Germishuys <[email protected]>

From libgit-raw-perl 0.90+ds-3+b1 in Debian 13 (Trixie). Parsed by carta from the page's man source.