appengine/monorail/templates/framework/artifact-collision-page.ezt - Issue 1868553004: Open Source Monorail

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: appengine/monorail/templates/framework/artifact-collision-page.ezt

Issue 1868553004: Open Source Monorail (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: Rebase Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
(Empty)
	1 [include "../framework/master-header.ezt" "showtabs"]

	2

	3 [# Note: No need for UI element permission checking here. ]

	4

	5 <h3>Update Collision</h3>

	6

	7 <h4>What happened?</h4>

	8

	9 <p>While you were viewing or updating [artifact_name], another user

	10 submitted an update to it. That user's update has already

	11 taken effect. Your update cannot be saved because your changes could

	12 overwrite the other user's changes.</p>

	13

	14 <p>Note: if you have been viewing and updating [artifact_name] in multiple

	15 browser windows or tabs, it is possible that the "other user" is

	16 actually yourself.</p>

	17

	18

	19 <div style="margin:2em" class="help">

	20 <b style="margin:0.5em">Your options:</b>

	21

	22 <ul>

	23 <li>Start over: view the up-to-date

	24 <a href="[artifact_detail_url]">[artifact_name]</a>

	25 and consider making your changes again.</li>

	26 </ul>

	27

	28 </div>

	29

	30 [include "../framework/master-footer.ezt"]

OLD	NEW