lxd icon indicating copy to clipboard operation
lxd copied to clipboard

Update first_steps.md

Open Alwoch opened this issue 1 year ago • 6 comments

The current documentation seems to imply that we are updating snap. I just had to specify that its the lxd snap we're updating to avoid confusion

Alwoch avatar Sep 24 '24 06:09 Alwoch

Also can you please sign Canonical's CLA?

MggMuggins avatar Sep 24 '24 16:09 MggMuggins

Heads up @mionaalex - the "Documentation" label was applied to this issue.

github-actions[bot] avatar Sep 25 '24 09:09 github-actions[bot]

Also can you please sign Canonical's CLA?

Done! also I've modified it to conform to the convention

Alwoch avatar Sep 25 '24 09:09 Alwoch

Thanks; can you also rebase the PR into one commit and use the commit title convention that's described here?

MggMuggins avatar Sep 25 '24 14:09 MggMuggins

git rebase -i main should be all you need to then mark the last commit (capitalize LXD) for fixup. This will "merge" or "fuse" the 2 commits into one.

After that, you should be able to push with force: git push -f

simondeziel avatar Oct 03 '24 21:10 simondeziel

Hi @minaelee please could you assist with either getting this contribution ready to be merged, or potentially make the change yourself (whilst maintaining attribution to @Alwoch ) and we can close this? Thanks

tomponline avatar Oct 22 '24 11:10 tomponline

@Alwoch Thanks for your contribution! I see that it's your first contribution to Canonical, and I'd love to help you get it ready for merge.

Here are detailed instructions to rebase as well as to update the commit message:

  • In a terminal, in a local clone of your fork of the lxd repository, switch to your PR branch (patch-1). (Note: if you used the GH web interface to make your commits and PR instead of a local clone, you'll need to clone your forked repository locally, checkout/switch to the PR branch there (git switch -c patch-1 origin/patch-1), then sync with git pull origin patch-1 before you rebase.)
  • Then run git rebase -i main in your terminal. This will open the text editor set for git, or the default system editor if one isn't set for git.
  • In the text editor, you should see a list of your recent commits. To the left of the last commit, change the text pick to fixup. Save & exit the editor.
  • Run git commit --amend. This will open the editor again. In it, edit your commit message to something like doc/tutorial: specify LXD snap and save & exit.
  • Force push the changes with git push -f.

Reach out if you have questions. In the interest of completing this change, I will wait a week and if I haven't heard back, I will close this PR and open a new one with attribution to you.

minaelee avatar Oct 31 '24 13:10 minaelee

@Alwoch Thanks for your contribution! I see that it's your first contribution to Canonical, and I'd love to help you get it ready for merge.

Here are detailed instructions to rebase as well as to update the commit message:

  • In a terminal, in a local clone of your fork of the lxd repository, switch to your PR branch (patch-1). (Note: if you used the GH web interface to make your commits and PR instead of a local clone, you'll need to clone your forked repository locally, checkout/switch to the PR branch there (git switch -c patch-1 origin/patch-1), then sync with git pull origin patch-1 before you rebase.)
  • Then run git rebase -i main in your terminal. This will open the text editor set for git, or the default system editor if one isn't set for git.
  • In the text editor, you should see a list of your recent commits. To the left of the last commit, change the text pick to fixup. Save & exit the editor.
  • Run git commit --amend. This will open the editor again. In it, edit your commit message to something like doc/tutorial: specify LXD snap and save & exit.
  • Force push the changes with git push -f.

Reach out if you have questions. In the interest of completing this change, I will wait a week and if I haven't heard back, I will close this PR and open a new one with attribution to you.

Hi @minaelee , you can go ahead and open a new PR because I'm avoiding cloning the repository. Thanks

Alwoch avatar Oct 31 '24 14:10 Alwoch

Closing in favor of #14382; thanks @Alwoch!

minaelee avatar Nov 04 '24 14:11 minaelee