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

	F18782789: D21318.id50785.diff
	Mon, Oct 13, 2:36 AM

	F18765139: D21318.id50746.diff
	Tue, Oct 7, 9:45 AM

	F18658467: D21318.diff
	Tue, Sep 23, 6:39 AM

	F18457930: D21318.id.diff
	Sep 1 2025, 1:24 PM

	F18446227: D21318.diff
	Aug 31 2025, 9:13 PM

	F18283982: D21318.diff
	Aug 23 2025, 2:18 AM

	F18198729: D21318.diff
	Aug 18 2025, 1:10 AM

	F18101154: D21318.id.diff
	Aug 9 2025, 12:21 PM

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