gitlab-org--gitlab-foss/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml

---
title: Keep trailing newline when resolving conflicts by picking sides
merge_request:
author: