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

(GH-1416) Incorrect documentation for Install-ChocolateyInstallPackage #1425

Closed
wants to merge 1 commit into from

Conversation

danyelcampbell
Copy link

@danyelcampbell danyelcampbell commented Oct 14, 2017

The -ValidExitCodes should not have the "=" in it

Fix -ValidExitCodes = @(0) to -ValidExitCodes @(0)

Closes #1416

@danyelcampbell danyelcampbell changed the title (GH 1416 doc) Incorrect documentation for Install-ChocolateyInstallPackage (GH 1416) Incorrect documentation for Install-ChocolateyInstallPackage Oct 14, 2017
@ferventcoder
Copy link
Member

Hi @danyelcampbell, Looks great! Just one bit of fixing and it will be good to pull in. You can do it or I can handle it, your choice. The git commit message should be (GH-1416) <summary>. The contributing doc walks through how to do that. Let me know which way you want to go. Thanks!

@ferventcoder ferventcoder self-assigned this Oct 16, 2017
@ferventcoder ferventcoder changed the title (GH 1416) Incorrect documentation for Install-ChocolateyInstallPackage (GH-1416) Incorrect documentation for Install-ChocolateyInstallPackage Oct 16, 2017
@danyelcampbell
Copy link
Author

Oh, I should be able to do that!

@danyelcampbell
Copy link
Author

well, I've somehow done two reverts....wanted to do just one and edit the commit. No idea how to fix what I have done now D:

@ferventcoder
Copy link
Member

Hi @danyelcampbell,
Did you have questions after reading the CONTRIBUTING document I pointed you to earlier? It's very clear on how to handle the process of using git, it even includes some help on responding to feedback - https://github.com/chocolatey/choco/blob/master/CONTRIBUTING.md#respond-to-feedback-on-pull-request.

@ferventcoder
Copy link
Member

ferventcoder commented Oct 18, 2017

I'm guessing you may have missed a step as this is in your master branch and not under a feature branch.

Reverts are not the best way to manage fixes.

From where you are now, here is what I would do:

  • git checkout master (this probably is a noop as you are likely already on master)

  • git rebase -i HEAD~3

  • This is going to bring up a screen (notepad-like) showing the last three commits. Two of those are likely the revert commits and the last one should be the original commit. If this is not what you see, close the screen without making any changes.

  • If you see those three commits, delete the two lines containing the revert commits.

  • Change the "pick" on the left side of the remaining commit to "r".

  • Save and exit the file

  • It should immediately bring up another screen asking you to reword the commit message.

  • Then when you save and close that, it will work through the other two commits.

  • When it is done, git push origin master --force (next time ensure you set up a branch).

Hope that helps. Here is an image that is helpful for the rebase part (which can be intimidating at first):

image

@ferventcoder
Copy link
Member

Some helpful things with git - choco install gitextensions -y. I still use this quite a bit of the time in visualization. Plus it is very helpful (and sometimes quicker) when I'm wanting to stage just parts of a file for commit.

It's also helpful with removing commits from a branch.

@ferventcoder
Copy link
Member

image

@danyelcampbell
Copy link
Author

Okay, let me give this another shot!

@danyelcampbell
Copy link
Author

I think I've finally done it! What a learning process this who thing has been :D

@ferventcoder
Copy link
Member

Awesome! Git is definitely a learning process!

The -ValidExitCodes should not have the "=" in it

Fix -ValidExitCodes = @(0) to -ValidExitCodes @(0)
@gep13 gep13 changed the base branch from master to stable February 28, 2018 13:40
@gep13 gep13 changed the base branch from stable to master February 28, 2018 13:41
@gep13
Copy link
Member

gep13 commented Feb 28, 2018

This has been merged into the stable branch here: 0906de8

Thank you for your contribution!

@gep13 gep13 closed this Feb 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants