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

This commit is contained in:
Aleksey Kulikov 2022-01-25 18:41:40 +03:00
parent e7c18c35e2
commit 615df610aa
8 changed files with 393 additions and 348 deletions

View file

@ -189,7 +189,7 @@ void main() {
test('cleans up state', () {
expect(repo.state, GitRepositoryState.none);
final commit = Commit.lookup(repo: repo, oid: repo['5aecfa0']);
repo.cherryPick(commit);
Merge.cherryPick(repo: repo, commit: commit);
expect(repo.state, GitRepositoryState.cherrypick);
repo.stateCleanup();