From 469cf102eaf4af0526deaefe15c5d6cfbf306c00 Mon Sep 17 00:00:00 2001
From: Yves Biener <yves.biener@gmx.de>
Date: Sun, 22 Oct 2023 16:32:15 +0200
Subject: [PATCH] add(taskwarrior): merge for remote changes without local
 changes

---
 internal/gitw/project.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/gitw/project.go b/internal/gitw/project.go
index 5245966..fc85d92 100644
--- a/internal/gitw/project.go
+++ b/internal/gitw/project.go
@@ -52,7 +52,7 @@ func (project *Project) Fetch() error {
 		issue_comments = append(issue_comments, gitea.Comment{
 			Body:       strings.ReplaceAll(issue.Body, "\r\n", "\n"),
 			Created_at: issue.Created_at,
-			Updated_at: issue.Updated_at,
+			Updated_at: issue.Created_at,
 		})
 		for _, comment := range comments {
 			if comment.Issue_url == issue.Html_url {
@@ -210,7 +210,7 @@ func (issue *Issue) MergeTask(task taskwarrior.Task) (taskwarrior.Task, error) {
 					task.Status = prompt(task.Status, issue.git_issue.State, task.Status)
 				}
 			}
-			if len(task.Annotations) != len(issue.comments)+1 {
+			if len(task.Annotations) != len(issue.comments) {
 				var annotations []string
 				annotations = append(annotations, issue.git_issue.Body)
 				for _, annotation := range task.Annotations {