tree c0dd7ddb16c0982be0bc7b1c761a19bfe8a2b53d
parent 4f0175433463887c22436edc2b953c0e6a038347
author Edwin Kempin <ekempin@google.com> 1729249298 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1729514236 +0000

Rebase change edit: Let caller know whether there have been conflicts

Change the rebase change edit REST endpoint to return the rebased change
edit, rather than a '204 No Content' response. This allows us to include
a 'contains_git_conflicts' flag into the returned EditInfo so that
callers can know whether rebasing the change edit resulted in conflicts
(if 'allow_conflicts' was set in the request input).

This changes the response code for a successful rebase from '204 No
Content' to '200 OK'.

Release-Notes: skip
Bug: Google b/364179875
Change-Id: I90c71b74752fdd6817b0e8e8ec0acdb7a1310580
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 09ed9f24816e949bbf34e28ed09a7bfcc85d2048)