Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional command docs for Altis v3 #129

Merged
merged 5 commits into from
Feb 18, 2020
Merged

Conversation

roborourke
Copy link
Contributor

Completes the command docs for the v3 release.

@roborourke roborourke requested a review from joehoyle February 17, 2020 17:28
@roborourke roborourke merged commit 6cecd83 into master Feb 18, 2020
@roborourke roborourke deleted the document-shell-command-v3 branch February 18, 2020 14:28
@hm-backport
Copy link

hm-backport bot commented Feb 18, 2020

The backport to v3-branch failed:

Commits ["62c334d2edce72d25d50ee8f41dd4f894a109731","70604e1490bea4768e77bc9753c1fa22ab0a3d94","e9a166603505b40617f3ae5d7801a1c5550cbc06","7b7cb788035a4f821402b170909435ce055b6228","963fa5d484d5a77f8e446df46669d51d8b428bf1"] could not be cherry-picked on top of v3-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 v3-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 62c334d2edce72d25d50ee8f41dd4f894a109731 70604e1490bea4768e77bc9753c1fa22ab0a3d94 e9a166603505b40617f3ae5d7801a1c5550cbc06 7b7cb788035a4f821402b170909435ce055b6228 963fa5d484d5a77f8e446df46669d51d8b428bf1
# Create a new branch with these backported commits.
git checkout -b backport-129-to-v3-branch
# Push it to GitHub.
git push --set-upstream origin backport-129-to-v3-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 v3-branch and the compare/head branch is backport-129-to-v3-branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants