Исправление ошибки когда релиз+работа над задачей

.semver.txt

@@ -1 +1 @@
-1.0.57
+1.0.59

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -107,9 +107,9 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == taskTimeItem.Branch);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-
+                    _log.Error($"Ошибка получения задачи из JIRA: {ex.Message} - {ex.InnerException?.Message}");
                 }
                 if (issue == null)
                 {

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -85,7 +85,12 @@ namespace JiraTimeBot.Mercurial
 
                     if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
                     {
-                        var branch = task.Description.Replace("Merge with", "").Replace(" ", "");
+                        var description = task.Description;
+                        if (description.Contains("\n"))
+                        {
+                            description = description.Split('\n')[0];
+                        }
+                        var branch = description.Replace("Merge with", "").Replace(" ", "");
                         var release = task.Branch.Replace("release", "");
 
                         task.Branch = branch;

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
 //                                                  
 // You can specify all the values or you can default the Build and Revision Numbers                                                  
 // by using the '*' as shown below:                                                  
-[assembly: AssemblyVersion("1.0.57")] 
+[assembly: AssemblyVersion("1.0.59")] 
-[assembly: AssemblyFileVersion("1.0.57")] 
+[assembly: AssemblyFileVersion("1.0.59")] 
-[assembly: AssemblyInformationalVersion("1.0.57")] 
+[assembly: AssemblyInformationalVersion("1.0.59")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -57,7 +57,18 @@ namespace JiraTimeBot.TaskTime
             }
 
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
-            workTimeItems.AddRange(workTasks);
+            foreach (var workTask in workTasks)
+            {
+                var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                if (existingItem != null)
+                {
+                    existingItem.TimeSpent += workTask.TimeSpent;
+                    existingItem.Description += "\r\n" + workTask.Description;
+                    continue;
+                }
+
+                workTimeItems.Add(workTask);
+            }
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
 
             remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);