class documentation
class MergeDriver(Protocol):
Protocol for merge drivers.
| Method | merge |
Perform a three-way merge. |
def merge(self, ancestor:
bytes, ours: bytes, theirs: bytes, path: str | None = None, marker_size: int = 7) -> tuple[:
ΒΆ
Perform a three-way merge.
| Parameters | |
ancestor:bytes | Content of the common ancestor version |
ours:bytes | Content of our version |
theirs:bytes | Content of their version |
path:str | None | Optional path of the file being merged |
markerint | Size of conflict markers (default 7) |
| Returns | |
tuple[ | Tuple of (merged content, success flag) If success is False, the content may contain conflict markers |