32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml\unreleased\changelogs - delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

index : delta/gitlab/gitlab-ce.git

gitlab.com: gitlab-org/gitlab-ce.git

summary refs log tree commit diff

path: root/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml

blob: eca42176501784478a10363520f8c9fb97d78065 (plain)

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