Cheatsheet for the stacked diffs workflow in phabricator at Fictiv

Stacked-diff-steps.md

stack diff steps

1. Checkout & pull latest master

git checkout master && git pull --rebase origin master

2. Cut branch from master

arc branch stacked_feature_1

3. Make changes, add commits

# ...change, change, change
git add .
git commit

4. Diff against master

arc diff

5. Push the stacked_feature_1 branch to github. (Note: this is important so that the following diffs can be patched in the test build for jenkins)

git push origin stacked_feature_1

6. Cut branch from stacked_feature_1

arc branch stacked_feature_2

7. Make changes, add commits

# ...change, change, change
git add .
git commit

8. Diff against stacked_feature_1

arc diff stacked_feature_1

9. [optional] Verify branch status

arc branch

10. Steps 5-9 can be repeated for as needed
11. If commits or changes need to be made on stacked_feature_1

git checkout stacked_feature_1
# ...change, change, change
git add .
git commit
arc diff

11.1 Now we need to update our next branch (Note: this would need to be repeated for each branch that was cut from this)

git checkout stacked_feature_2
git pull

12. If commits or changes need to be made on stacked_feature_2, we need to make sure we diff against the same branch that we cut from

# ...change, change, change
git add .
git commit
arc diff stacked_feature_1

13. When it comes time to land things, there are 2 rules we must follow.
    1. We must land in the same order that we cut in, or in FIFO order -- first in, first out
    2. And we land with --keep-branch so that the following lands don't break

git checkout stacked_feature_1
arc land --keep-branch
git checkout stacked_feature_2
# You may need to rebase from your upstream branch and then rebase master before landing
git pull --rebase . stacked_feature_1
git pull --rebase origin master
arc land --keep-branch --revision DXXX # Where DXXX is the diff id from stacked_feature_1