Sven Selberg 183b4faaf6 Provide more informative error message for Change-Id conflicts ...

Currently, when two or more commits in the same push to refs/for has the
same Change-Id, the user is asked to "squash commits first". This is
only informative when the user responds to a code review by adding a new
commit with the same Change-Id on top of the previous patch set.
When there is a series of five commits where two of them have the same
Change-Id, squashing the commits might not give the desired result.

This change improved the error message to be more intuitive so the user
can act accordingly.

Change-Id: Iffaa5e3d8c37ac37e9b5f432c888aadf644ec639

2016-04-12 14:18:12 +00:00

4.2 KiB

Raw Blame History

View Raw