Исправлен билд

.semver.txt

@@ -1 +1 @@
-1.0.62
+1.0.64

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.62")] 
+[assembly: AssemblyVersion("1.0.64")] 
-[assembly: AssemblyFileVersion("1.0.62")] 
+[assembly: AssemblyFileVersion("1.0.64")] 
-[assembly: AssemblyInformationalVersion("1.0.62")] 
+[assembly: AssemblyInformationalVersion("1.0.64")] 

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -25,5 +25,13 @@ namespace JiraTimeBot.TaskTime.Objects
             FilesAffected = filesAffected;
             Type = type;
         }
+
+        public void MergeWith(TaskTimeItem toMerge)
+        {
+            Commits += toMerge.Commits;
+            TimeSpent += toMerge.TimeSpent;
+            Description += "\r\n" + toMerge.Description;
+            Type |= toMerge.Type;
+        }
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -59,12 +59,10 @@ namespace JiraTimeBot.TaskTime
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
             foreach (var workTask in workTasks)
             {
-                var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
                 if (existingItem != null)
                 {
-                    existingItem.TimeSpent += workTask.TimeSpent;
+                    existingItem.MergeWith(workTask);
-                    existingItem.Description += "\r\n" + workTask.Description;
-                    existingItem.Type |= CommitType.Task;
                     continue;
                 }
 

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -26,7 +26,7 @@ namespace JiraTimeBot.TaskTime
             {
                 int currentTaskCommits = taskGroup.Count();
                 int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
-                remainMinutes = remainMinutes - currentTaskTime;
+                remainMinutes -= currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
                 StringBuilder sb = new StringBuilder();