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