diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-19 18:22:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-19 18:22:21 +0300 |
| commit | 441f37f23bc2aa2669107d6bc8bed86046e225f4 (patch) | |
| tree | afa0e1a8831e41d2d8c1adccdd0a18caed78b5fe /changelogs | |
| parent | b54faeb9527d61a89c999dc77c2af119942110ec (diff) | |
| parent | c215461cfc2923c9db2bf9794e7954fcf343e6c9 (diff) | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'
Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream"
See merge request !11533
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml b/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml new file mode 100644 index 00000000000..19a3c56e478 --- /dev/null +++ b/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml @@ -0,0 +1,5 @@ +--- +title: Prevent further repository corruption when resolving conflicts from a fork + where both the fork and upstream projects require housekeeping +merge_request: +author: |