diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 20:37:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-12 20:37:30 +0000 |
| commit | e4261fe3ce0e6ba38db99323b9fb479c6a182d77 (patch) | |
| tree | d555e87d9d28a34f35ed4974653e5e8cebac8c87 /changelogs | |
| parent | e5a967aa0380a618829e4371012da56de59bc739 (diff) | |
| parent | ad2bfeb85756db8c4cea9290be743665efd1c918 (diff) | |
| download | gitlab-ce-e4261fe3ce0e6ba38db99323b9fb479c6a182d77.tar.gz | |
Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
Fix conflict resolution from corrupted upstream
Closes gitlab-ee#2128
See merge request !11298
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: |