mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-08-17 00:00:31 +03:00
Better filter branches to unapply in case of conflicts
This commit is contained in:
commit
2d0dc3a9ff
@ -3343,7 +3343,7 @@ pub fn create_virtual_branch_from_branch(
|
|||||||
.0
|
.0
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(branch, _)| branch)
|
.map(|(branch, _)| branch)
|
||||||
.filter(|branch| branch.applied)
|
.filter(|branch| branch.id != branch_id)
|
||||||
{
|
{
|
||||||
convert_to_real_branch(project_repository, branch.id, Default::default())?;
|
convert_to_real_branch(project_repository, branch.id, Default::default())?;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user