---
redirect_to: '../../../topics/git/merge_conflicts.md'
---

This document was moved to [another location](../../../topics/git/merge_conflicts.md).

<!-- This redirect file can be deleted after <2021-08-13>. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->