gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-29 20:43:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4754 from gitbutlerapp/Use-correct-sides

Browse Source 
Use the auto-resolution if the head is conflicted
This commit is contained in:
Caleb Owens 2024-08-26 15:11:08 +02:00 committed by GitHub
commit 3170042895
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/gitbutler-repo/src/repository_ext.rs
View File

@ -402,13 +402,13 @@ impl RepositoryExt for git2::Repository {
// we need to do a manual 3-way patch merge
// find the base, which is the parent of to_rebase
let base = if to_rebase.is_conflicted() {
self.find_real_tree(to_rebase, ConflictedTreeKey::Ours)?
self.find_real_tree(to_rebase, ConflictedTreeKey::Base)?
} else {
let base_commit = to_rebase.parent(0)?;
self.find_real_tree(&base_commit, Default::default())?
};
// Get the original ours
let ours = self.find_real_tree(head, ConflictedTreeKey::Theirs)?;
let ours = self.find_real_tree(head, Default::default())?;
// Get the original theirs
let thiers = self.find_real_tree(to_rebase, ConflictedTreeKey::Theirs)?;