gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-06 01:27:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

no error is branch is already applied

Browse Source
This commit is contained in:
Nikita Galaiko 2023-09-18 13:59:50 +02:00 committed by GitButler
parent cb37cbadfb
commit 49d5295911
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/tauri/src/virtual_branches/vbranch.rs
View File

@ -2092,8 +2092,9 @@ pub fn is_virtual_branch_mergeable(
let branch = branch_reader
.read(branch_id)
.context("failed to read branch")?;
if branch.applied {
bail!("branch {} is applied", branch.name);
return Ok(true);
}
let default_target = get_default_target(&current_session_reader)