summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml
blob: 19a3c56e478399018b1491db7e34f8ab016e8f88 (plain)
1
2
3
4
5
---
title: Prevent further repository corruption when resolving conflicts from a fork
  where both the fork and upstream projects require housekeeping
merge_request:
author: