diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-11 11:35:50 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-11 11:35:50 +0000 |
| commit | ac425c1528a160eb1609587de08a1510809fc383 (patch) | |
| tree | 0199c1db2d5bce7e8b60ce3de34e285e18775750 /changelogs | |
| parent | 06713cb7b07f30eda8f67531387f7cb8801987b1 (diff) | |
| parent | a560f785f7f34b932c285365790a27d15bd100ec (diff) | |
| download | gitlab-ce-ac425c1528a160eb1609587de08a1510809fc383.tar.gz | |
Merge branch '4020-rebase-message' into 'master'
Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.'
Closes #41820
See merge request gitlab-org/gitlab-ce!16326
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/4020-rebase-message.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/4020-rebase-message.yml b/changelogs/unreleased/4020-rebase-message.yml new file mode 100644 index 00000000000..4793f3d9cb9 --- /dev/null +++ b/changelogs/unreleased/4020-rebase-message.yml @@ -0,0 +1,5 @@ +--- +title: Display user friendly error message if rebase fails. +merge_request: +author: +type: fixed |