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

refactor(merge)!: move merge related methods into Merge class (#41)

Browse source
This commit is contained in:
Aleksey Kulikov 2022-01-25 18:53:04 +03:00 • committed by GitHub
parent e7c18c35e2
commit 570c696269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 393 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/src/bindings/merge.dart
View file

@ -115,7 +115,7 @@ List<int> analysis({
return result;
}
/// Merges the given commit(s) into HEAD, writing the results into the working
/// Merges the given commit into HEAD, writing the results into the working
/// directory. Any changes are staged for commit and any conflicts are written
/// to the index. Callers should inspect the repository's index after this
/// completes, resolve any conflicts and prepare a commit.
@ -285,7 +285,7 @@ Pointer<git_index> mergeCommits({
}
}
/// Merge two trees, producing a git_index that reflects the result of the
/// Merge two trees, 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 part of the merge.