| commit | f1d9cab34868023978edaa4f9bfcb30ec850b813 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <edwin.kempin@sap.com> | Thu Feb 12 14:35:33 2015 +0100 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Feb 13 07:36:23 2015 +0000 |
| tree | 90cde47a3976dc1f7b394f6bc63a1b739f8f78d2 | |
| parent | 4512bb4582080fa2da9d88115bcf8f20209706ec [diff] |
Fail with 409 if rebase of change edit fails due to conflicts With this the user gets a proper error message displayed, rather then getting the generic 'Server Error' message. Change-Id: Icd60ebaff7756906899293ba689dc3e77be63431 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>