For more information on the search, visit the help page.
MergeConflict
__init__
path
merge
Merger
make_merge3
merge_blobs
octopus_merge
recursive_merge
three_way_merge
_can_merge_lines
_create_virtual_commit
_merge3_to_bytes
_merge_lines
dulwich.merge.MergeConflict
dulwich
class MergeConflict(Exception):
Constructor: MergeConflict(path, message)
MergeConflict(path, message)
View In Hierarchy
Raised when a merge conflict occurs.
bytes
str
Initialize MergeConflict.
Undocumented