cmd/gopherbot: change issue nitification comment to include authoer name

Author: kzisme

cmd/gopherbot/gopherbot.go

@@ -831,7 +831,7 @@ func (b *gopherbot) cl2issue(ctx context.Context) error {
 					continue
 				}
 				hasComment := false
-				substr := fmt.Sprintf("Change https://golang.org/cl/%d by %s mentions this issue: `%s`", cl.Number)
+				substr := fmt.Sprintf("Change https://golang.org/cl/%d mentions this issue.", cl.Number)
 				gi.ForeachComment(func(c *maintner.GitHubComment) error {
 					if strings.Contains(c.Body, substr) {
 						hasComment = true
@@ -841,11 +841,9 @@ func (b *gopherbot) cl2issue(ctx context.Context) error {
 				})
 				if !hasComment {
 					printIssue("cl2issue", gi)
-<<<<<<< HEAD
+
 					msg := fmt.Sprintf("Change https://golang.org/cl/%d by %s mentions this issue: `%s`", cl.Number, strings.Split("cl.Commit.Author", "<")[0], cl.Commit.Summary())
-=======
-					msg := fmt.Sprintf("Change https://golang.org/cl/%d by @%s mentions this issue: `%s`", cl.Number, cl.Commit.Author, cl.Commit.Summary())
->>>>>>> 04e54a31def4afb0784d367372b9736182f2e172
+
 					if err := b.addGitHubComment(ctx, "golang", "go", gi.Number, msg); err != nil {
 						return err
 					}