Wrong formatting with merge checkout strategy

[pavelpulec]

Community Note

• Please vote on this issue by adding a 👍 reaction to the original issue to help the community and maintainers prioritize this request. Searching for pre-existing feature requests helps us consolidate datapoints for identical requirements into a single place, thank you!
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.
• If you are interested in working on this issue or have submitted a pull request, please leave a comment.

---

Overview of the Issue

We've recently enabled the "merge" checkout strategy and we noticed the wrong formatting of messages. See the screenshot below. The emoji is not evaluated and the information about the upstream modifications goes on the same line in a PR comment.

Reproduction Steps

It shows up in all PRs that are not up 2 date with the base branch and Atlantis tries to merge them.

Environment details

• Atlantis version: 0.28.1
• Deployment method: ECS, TF module -> terraform-aws-modules/ecs/aws//modules/service
• If not running the latest Atlantis version have you tried to reproduce this issue on the latest version: No. I'm running almost the latest version and there are no recent changes in server/events/templates/merged_again.tmpl.
• Atlantis flags: ATLANTIS_CHECKOUT_STRATEGY=merge

[X-Guardian]

Fixed in #5064