humanmade / altis-documentation

Documentation module for Altis
https://docs.altis-dxp.com/
6 stars 3 forks source link

Various doc fixes #534

Closed mikelittle closed 1 year ago

mikelittle commented 1 year ago

Some grammar changes.

hm-backport[bot] commented 1 year ago

The backport to v16-branch failed:

Commits ["5d909257b7c31b1c2f16a2cc5edfdc861524579d","494b42a16103e5872a60bb733bc2a300b4e1c75f","6766affd1812ef478cd3aa251b7e0885811b9646","348d252435fd95e4d211e057492c83ae72975c43","3d9a3ddb64b53f2c2d734a95149560835ce554d7","077821cad084f1f4a47e1e14a4928abdd49b2eab","fbacf9f5ab0d075064ab11705f3a4d6e584b09ad","840b86d9bbff056c6ecc370880d8b494a8636216"] could not be cherry-picked on top of v16-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v16-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 5d909257b7c31b1c2f16a2cc5edfdc861524579d 494b42a16103e5872a60bb733bc2a300b4e1c75f 6766affd1812ef478cd3aa251b7e0885811b9646 348d252435fd95e4d211e057492c83ae72975c43 3d9a3ddb64b53f2c2d734a95149560835ce554d7 077821cad084f1f4a47e1e14a4928abdd49b2eab fbacf9f5ab0d075064ab11705f3a4d6e584b09ad 840b86d9bbff056c6ecc370880d8b494a8636216
# Create a new branch with these backported commits.
git checkout -b backport-534-to-v16-branch
# Push it to GitHub.
git push --set-upstream origin backport-534-to-v16-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v16-branch and the compare/head branch is backport-534-to-v16-branch.