search

projectatomic / vagrant-service-manager

To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment.
GNU General Public License v2.0
18 stars 16 forks source link

Fix #429 Minor language and formatting edits to Proxy section etc. #428

Closed Preeticp closed 8 years ago

Preeticp commented 8 years ago

Fix for issue #429

coolbrg commented 8 years ago

LGTM :+1:

hferentschik commented 8 years ago

@Preeticp Could you please open an issue for this change and reference it in the commit message. Even though it is a minor change it should go through the proper process.

Preeticp commented 8 years ago

@hferentschik, I did this is as part of fix for ADB issue #566; https://github.com/projectatomic/adb-atomic-developer-bundle/issues/566. Can I reference the same, or do I need to create a separate issue in the vagrant service manager repository?

hferentschik commented 8 years ago

or do I need to create a separate issue in the vagrant service manager repository?

Yes please. We need to have an issue in service-manager as well to properly track changes within the repo as well (plan milestones, cut changelogs, map changes/commits to issues, etc)

hferentschik commented 8 years ago

@Preeticp Will you change the commit message or shall I do it?

Preeticp commented 8 years ago

Done, as per your instructions in IRC. Checked with Git Log, it shows the changed message. Let me know if it is not done right, I would like to do this myself, so that I can learn.

hferentschik commented 8 years ago

Checked with Git Log, it shows the changed message.

Good

Let me know if it is not done right, I would like to do this myself, so that I can learn.

As far as I can tell, you have not pushed the changes to your feature branch. There is no updated commit in this pull request. You will have to force push (on your feature branch):

git push -f HEAD

This should push your local changes to the feature branch to the pull request.

Preeticp commented 8 years ago

@hferentschik $ git push -f HEAD gave me the following error: fatal: 'HEAD' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. However I was able to do $ git push origin branch_name -f and I think it worked. Do let me know if there are any concerns.

hferentschik commented 8 years ago

Sorry, parts of my message disappeared in my last comment, since I forgot to escape properly

git push -f <fork> HEAD

HEAD is just a git "alias" for the current branch. By using head you don't have to think about the current branch name.

Preeticp commented 8 years ago

Thanks @hferentschik, parts within angular brackets seem to disappear in the comments, you need to use backticks for it to show I guess, like<xyz>.