From 31af6f43e8785436805abb1be6e9a5ae2400b67d Mon Sep 17 00:00:00 2001 From: PainElemental <52151581+PainElemental@users.noreply.github.com> Date: Thu, 8 Apr 2021 09:19:29 +0200 Subject: [PATCH] Update BranchesViewModel.cs Fix problem of "target branches not found" introduced with this pull request: https://github.com/CDuke/AutoMerge/commit/37e899a621a2d569055b6fd37327916ffd57f25e --- src/AutoMerge/Branches/BranchesViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AutoMerge/Branches/BranchesViewModel.cs b/src/AutoMerge/Branches/BranchesViewModel.cs index 00b49e1..1723ad0 100644 --- a/src/AutoMerge/Branches/BranchesViewModel.cs +++ b/src/AutoMerge/Branches/BranchesViewModel.cs @@ -478,7 +478,7 @@ private static ItemIdentifier GetTargetPath(ICollection mergesRe private static bool IsTargetPath(ItemIdentifier mergeRelations, ItemIdentifier branch) { - return mergeRelations.Item.Contains(branch.Item + "/"); + return mergeRelations.Item.Contains(branch.Item + "/") || mergeRelations.Item == branch.Item; } private static string CalculateTopFolder(IList changes)