Issue 2868383002: Recover from merge problem

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 2868383002: Recover from merge problem (Closed)

Created:
3 years, 7 months ago by messick

Modified:
3 years, 7 months ago

Reviewers:
Brian Wilkerson

CC:
reviews_dartlang.org

Target Ref:
refs/heads/master

Visibility:
Public.

Created: 3 years, 7 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+850 lines, -53 lines)			Patch
A	pkg/analysis_server/lib/src/services/completion/statement/design_notes.md	View	1 chunk	+144 lines, -0 lines	0 comments	Download
M	pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart	View	21 chunks	+246 lines, -35 lines	0 comments	Download
M	pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart	View	19 chunks	+460 lines, -18 lines	0 comments	Download

Total messages: 5 (2 generated)

messick

This should be identical to https://codereview.chromium.org/2867123003/ Sorry for the churn.

3 years, 7 months ago (2017-05-10 18:30:16 UTC) #2

messick

3 years, 7 months ago (2017-05-10 20:12:23 UTC) #5

Message was sent while issue was closed.

Committed patchset #1 (id:1) manually as
55097a44b37f66406c148114328091c0a2ccaf38 (presubmit successful).