New issue
Advanced search Search tips
Note: Color blocks (like █ or █) mean that a user may not be available. Tooltip shows the reason.

Issue 709898 link

Starred by 1 user
Status: Fixed
Owner:
lukasza@chromium.org
Closed: Apr 2017
Cc:
jochen@chromium.org
█ alexclarke@chromium.org
dcheng@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Task



Sign in to add a comment

Blink rename left some stray DO NOT SUBMIT - Conflict resolution markers

Project Member Reported by alexclarke@chromium.org, Apr 10 2017 
I've sent a patch to remove these but I thought I'd file this bug in case   some further investigation is required.

Patch removing them https://codereview.chromium.org/2813523002#

Thanks!

Comment 1 by dcheng@chromium.org, Apr 10 2017

Cc: dcheng@chromium.org
Owner: lukasza@chromium.org
Status: Assigned (was: Untriaged)
I think these are innocuous and just comments we forgot to clean up.

(We had an internal patch affecting about ~1.5k lines of things that needed manual patching, and this was how we ensured that we updated these lines correctly when doing conflict resolution)

Assigning to lukasza to confirm; thanks for cleaning this up!

Comment 2 by dtapu...@chromium.org, Apr 10 2017

Components: -Blink Blink>Internals

Comment 3 by lukasza@chromium.org, Apr 10 2017

Status: Started (was: Assigned)

Comment 4 by lukasza@chromium.org, Apr 10 2017

Cc: alexclarke@chromium.org
Status: Fixed (was: Started)
Actually, I see that these have already been fixed by r463201.  Thanks alexclarke@ for your help on this!
►

Sign in to add a comment