Differential D5395 Diff 19318 docs/contributing/phabricator.rst

Changeset View

Standalone View

	Show First 20 Lines • Show All 240 Lines • ▼ Show 20 Lines

	Once your change has been approved in Differential,			Once your change has been approved in Differential,
	you will be able to land it onto the master branch.			you will be able to land it onto the master branch.

	Before doing so, you're encouraged to clean up your git commit history,			Before doing so, you're encouraged to clean up your git commit history,
	reordering/splitting/merging commits as needed to have separate			reordering/splitting/merging commits as needed to have separate
	logical commits and an easy to bisect history.			logical commits and an easy to bisect history.
	Update the diff :ref:`following the prior section <arc-update>`			Update the diff :ref:`following the prior section <arc-update>`
	(It'd be good to let the ci build finish to make sure everything is still green).			(It'd be good to let the CI build finish to make sure everything is still green).

	Once you're happy you can push to origin/master directly, e.g.::			Once you're happy you can push to origin/master directly, e.g.::

	git checkout master			git checkout master
	git merge --ff-only my-shiny-feature			git merge --ff-only my-shiny-feature
	git push			git push

	``--ff-only`` is optional, and makes sure you don't unintentionally			``--ff-only`` is optional, and makes sure you don't unintentionally
	Show All 32 Lines