New issue
Advanced search Search tips

Issue 654828 link

Starred by 1 user

Issue metadata

Status: Available
Owner: ----
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Feature



Sign in to add a comment

git-drover: provide clearer error message when commit is already in the branch

Project Member Reported by carlosk@chromium.org, Oct 11 2016

Issue description

I was trying to merge a commit that I didn't realize was already included in the m55 branch. git-drover would fail with a "failed to apply patch" error message but the files in the temporary directory (obviously) showed no conflict markers.

This was confusing and made me lose some time. It would be much better to have a clear message that the commit was already part of the branch.
 
Status: Available (was: Untriaged)

Sign in to add a comment