| commit | 6d83eba0bff364c6f18455bbf2064565022b3913 | [log] [tgz] |
|---|---|---|
| author | David Ostrovsky <david@ostrovsky.org> | Sat Jul 19 09:43:07 2014 +0200 |
| committer | David Ostrovsky <david@ostrovsky.org> | Tue Jul 22 10:00:53 2014 +0200 |
| tree | 57dbdfa0ec20b56233a7b2d92cce9e76780d1f17 | |
| parent | 9d9e54df09a59b45aebdeb0b63152e3ac5ec5417 [diff] |
Cherry-pick: Differentiate between conflicts and already merged errors When cherry-pick operation fails with "Cherry pick failed" error, there is no way to know the reason for the failure: merge conflict or the commit is already on the target branch. Differentiate between these failures and report the proper result to the client. Change-Id: If1139e3c13623fb98a9584e4e399cfdf45fd3613