New issue
Advanced search Search tips

Issue 789629 link

Starred by 1 user

Issue metadata

Status: Archived
Owner: ----
Closed: Jan 2018
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: ----
Type: ----


Show other hotlists

Hotlists containing this issue:
XXX

Previous locations:
gerrit:7875


Sign in to add a comment

Weird merge conflict

Project Member Reported by jlebel@google.com, Nov 29 2017

Issue description

I'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.


 

Comment 1 by logan@google.com, Nov 29 2017

Components: -PolyGerrit
Labels: Proj-Gerrit-Migration

Comment 2 by logan@google.com, Nov 29 2017

Project: chromium
Moved issue gerrit:7875 to now be  issue chromium:789629 .
Components:
Status: Archived (was: New)
Obsolete, cannot reproduce.

Sign in to add a comment