gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3986 from gitbutlerapp/apply-branch-fix

Browse Source 
when the branch being applied has a merge commit do merge only
This commit is contained in:
Kiril Videlov 2024-06-04 10:22:08 +02:00 committed by GitHub
commit 7cd1920d80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -361,16 +361,9 @@ pub fn apply_branch(
last_rebase_head = oid;
}
}
Err(err)
if err
.downcast_ref()
.map_or(false, |marker: &Marker| *marker == Marker::ProjectConflict) =>
{
Err(_) => {
rebase_success = false;
}
Err(err) => {
return Err(err).context("failed to apply branch");
}
}
if rebase_success {