class documentation
class ConflictedIndexEntry:
Constructor: ConflictedIndexEntry(ancestor, this, other)
Index entry that represents a conflict.
| Method | __init__ |
Initialize ConflictedIndexEntry. |
| Instance Variable | ancestor |
Undocumented |
| Instance Variable | other |
Undocumented |
| Instance Variable | this |
Undocumented |
def __init__(self, ancestor:
IndexEntry | None = None, this: IndexEntry | None = None, other: IndexEntry | None = None):
¶
Initialize ConflictedIndexEntry.
| Parameters | |
ancestor:IndexEntry | None | The common ancestor entry |
this:IndexEntry | None | The current branch entry |
other:IndexEntry | None | The other branch entry |