mirror of
https://github.com/SkinnyMind/libgit2dart.git
synced 2025-05-04 20:29:08 -04:00
feat(checkout)!: add ability to checkout commit (#35)
This commit is contained in:
parent
6fe24dcb65
commit
f7dde69de3
7 changed files with 115 additions and 38 deletions
|
@ -365,7 +365,7 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(refName: 'refs/heads/feature');
|
||||
conflictRepo.checkout(target: 'refs/heads/feature');
|
||||
|
||||
conflictRepo.merge(commit: commit);
|
||||
|
||||
|
@ -421,7 +421,7 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(refName: 'refs/heads/our-conflict');
|
||||
conflictRepo.checkout(target: 'refs/heads/our-conflict');
|
||||
|
||||
conflictRepo.merge(commit: commit);
|
||||
|
||||
|
@ -449,7 +449,7 @@ void main() {
|
|||
oid: conflictBranch.target,
|
||||
);
|
||||
|
||||
conflictRepo.checkout(refName: 'refs/heads/feature');
|
||||
conflictRepo.checkout(target: 'refs/heads/feature');
|
||||
|
||||
conflictRepo.merge(commit: commit);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue