When squash-merging into main, roll up context and descriptions

[amustafa]

Context and description are lost when merging. This can be useful information for tagging commits to particular tickets, sessions, jobs, etc. Keep it rolled up.