Provide more information about merge progress in "arc land" under Git
ClosedPublic
Actions

Authored by epriestley on Jun 5 2020, 11:08 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sat, Nov 23, 1:29 AM

	Unknown Object (File)
	Thu, Nov 21, 9:17 AM

	Unknown Object (File)
	Wed, Nov 20, 10:00 PM

	Unknown Object (File)
	Tue, Nov 19, 4:40 AM

	Unknown Object (File)
	Thu, Nov 14, 10:04 PM

	Unknown Object (File)
	Thu, Nov 14, 6:08 AM

	Unknown Object (File)
	Wed, Nov 13, 4:59 AM

	Unknown Object (File)
	Mon, Nov 11, 4:25 AM

View All Files

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T13546: Modernize the "arc land" workflow
Commits: rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git

Summary

Ref T13546. Communicate more progress information and provide additional details when merge conflicts occur.

Test Plan

Hit a merge conflict, saw more helpful output.

Diff Detail

Repository

rARC Arcanist

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

epriestley created this revision.Jun 5 2020, 11:08 PM

Harbormaster completed remote builds in B24568: Diff 50746.Jun 5 2020, 11:09 PM

epriestley requested review of this revision.Jun 5 2020, 11:09 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:20 PM

Closed by commit rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git.

Revision Contents
Changeset List

Path

Size

src/

land/

engine/

ArcanistGitLandEngine.php

52 lines

Diff 50785

View Options

src/land/engine/ArcanistGitLandEngine.php

Provide more information about merge progress in "arc land" under GitClosedPublicActions