mirror of
https://github.com/SkinnyMind/libgit2dart.git
synced 2025-06-23 09:19:26 -04:00
refactor(checkout)!: move checkout related methods into Checkout class (#42)
This commit is contained in:
parent
570c696269
commit
9918ab0905
10 changed files with 238 additions and 135 deletions
|
@ -364,7 +364,8 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(target: 'refs/heads/feature');
|
||||
Checkout.reference(repo: conflictRepo, name: 'refs/heads/feature');
|
||||
conflictRepo.setHead('refs/heads/feature');
|
||||
|
||||
Merge.commit(repo: conflictRepo, commit: commit);
|
||||
|
||||
|
@ -424,7 +425,8 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(target: 'refs/heads/our-conflict');
|
||||
Checkout.reference(repo: conflictRepo, name: 'refs/heads/our-conflict');
|
||||
conflictRepo.setHead('refs/heads/our-conflict');
|
||||
|
||||
Merge.commit(repo: conflictRepo, commit: commit);
|
||||
|
||||
|
@ -455,7 +457,8 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(target: 'refs/heads/feature');
|
||||
Checkout.reference(repo: conflictRepo, name: 'refs/heads/feature');
|
||||
conflictRepo.setHead('refs/heads/feature');
|
||||
|
||||
Merge.commit(repo: conflictRepo, commit: commit);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue