From a51d4cfbc876fd8ef24b6408d67238f6606a37ee Mon Sep 17 00:00:00 2001 From: Alexander Rakitin Date: Sat, 20 Feb 2021 15:02:41 +0300 Subject: [PATCH] Updated choosing target path Determine target path by searching with trailing slash "/" --- 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 a80d6d5..00b49e1 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 + "/"); } private static string CalculateTopFolder(IList changes)