Issue metadata
Sign in to add a comment
|
Weird merge conflict |
||||||||||||||||||
Issue descriptionI'm trying to land: https://chrome-internal-review.googlesource.com/c/chrome/ios_internal/+/516012 The error: https://logs.chromium.org/v/?s=chrome%2Fbb%2Finternal.bling.tryserver%2Fpresubmit%2F16488%2F%2B%2Frecipes%2Fsteps%2Fapply_gerrit%2F0%2Fstdout (just in case it disappear: https://paste.googleplex.com/5099526650068992 ) According to the error, there is a big merge conflict. But I don't understand since my patch contains only one file. It doesn't seem to make sense.
,
Nov 29 2017
,
Jan 3 2018
Obsolete, cannot reproduce. |
|||||||||||||||||||
►
Sign in to add a comment |
|||||||||||||||||||
Comment 1 by logan@google.com
, Nov 29 2017Labels: Proj-Gerrit-Migration