Issue 587453007: [NOT FOR REVIEW] 3-way merge example.

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 587453007: [NOT FOR REVIEW] 3-way merge example. (Closed)

Created:
6 years, 3 months ago by Primiano Tucci (use gerrit)

Modified:
6 years, 3 months ago

Reviewers:

CC:
chromium-reviews

Base URL:
https://chromium.googlesource.com/chromium/src.git@master

Project:
chromium

Visibility:
Public.

More Reviews

Description

[NOT FOR REVIEW] 3-way merge example. This is a pretty common case. This change is based on 2989fef8c7173769f4361c5bb55d991fa7c0ac26. However, by the time I uploaded and git cl try-ed this, somebody else have changed (removed) some lines near mine. In this (very realistic) case, the bot just fails to apply the patch, but could have succeed by using three way merge.

Patch Set 1 : #

Created: 6 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+4 lines, -1 line)			Patch
	M	build/common.gypi	View		1 chunk	+4 lines, -1 line	0 comments	Download

Messages

Total messages: 1 (1 generated)

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

Patchset #1 (id:1) has been deleted

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages