Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-05 04:39:07 -04:00
Code Issues Projects Releases Wiki Activity

feat(merge): add ability to merge file from index

Browse source
This commit is contained in:
Aleksey Kulikov 2021-10-04 12:23:48 +03:00
parent 5c8d6647eb
commit 52707dcc63
4 changed files with 87 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/src/repository.dart
View file

@ -677,6 +677,24 @@ class Repository {
commit_bindings.annotatedFree(theirHead.value);
}
/// Merges two files as they exist in the index, using the given common ancestor
/// as the baseline, producing a string that reflects the merge result containing
/// possible conflicts.
///
/// Throws a [LibGit2Error] if error occured.
String mergeFileFromIndex({
required IndexEntry? ancestor,
required IndexEntry? ours,
required IndexEntry? theirs,
}) {
return merge_bindings.mergeFileFromIndex(
repoPointer: _repoPointer,
ancestorPointer: ancestor?.pointer,
oursPointer: ours?.pointer,
theirsPointer: theirs?.pointer,
);
}
/// Merges two commits, producing an index that reflects the result of the merge.
/// The index may be written as-is to the working directory or checked out. If the index
/// is to be converted to a tree, the caller should resolve any conflicts that arose as