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

Update environmental-impact.yml #3362

Closed
wants to merge 1 commit into from
Closed

Conversation

RobenusW
Copy link

@RobenusW RobenusW commented Jul 13, 2022

Fixes #2830

What changes did you make and why did you make them ?

-Changed "content" to "content-type"
-Removed "type: icon"
-I did this because I followed what the issue said to change

Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

Visuals before changes are applied
Visuals after changes are applied

@github-actions
Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!

From your project repository, check out a new branch and test the changes.

git checkout -b hackforla-RobenusW-patch-1 gh-pages
git pull https://github.com/hackforla/website.git RobenusW-patch-1

@tamara-snyder
Copy link
Member

Hi @RobenusW, please add the issue number this PR relates to in the description so that the bot can add appropriate labels and reviewers can view the issue.

@lilyarj lilyarj self-requested a review July 13, 2022 04:12
@lilyarj
Copy link
Member

lilyarj commented Jul 13, 2022

@RobenusW please add the issue number at the top so we can review this pr :)

Hi @RobenusW, please add the issue number this PR relates to in the description so that the bot can add appropriate labels and reviewers can view the issue.

@BeckettOBrien BeckettOBrien self-requested a review July 13, 2022 17:59
@github-actions github-actions bot added good first issue Good for newcomers P-Feature: Credit https://www.hackforla.org/credits/ role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less labels Jul 14, 2022
@RobenusW
Copy link
Author

Hi @RobenusW, please add the issue number this PR relates to in the description so that the bot can add appropriate labels and reviewers can view the issue.

Sorry about that, I didn't read the instructions properly, I also just added the image after I realized I didn't follow the correct steps. Please tell me if there is anything getting in the way of merging.

@RobenusW
Copy link
Author

@RobenusW please add the issue number at the top so we can review this pr :)

Hi @RobenusW, please add the issue number this PR relates to in the description so that the bot can add appropriate labels and reviewers can view the issue.

Sorry about that, I didn't read the instructions properly, I also just added the image after I realized I didn't follow the correct steps. Please tell me if there is anything getting in the way of merging.

@blulady
Copy link
Member

blulady commented Jul 15, 2022

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

@lilyarj
Copy link
Member

lilyarj commented Jul 15, 2022

@RobenusW Also just as a note please only screenshot changes if changed have been made to the website, so no pictures of code are needed

@RobenusW
Copy link
Author

RobenusW commented Jul 16, 2022

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

I see. Should I create a new merge request using the correct branch or what should I do? Detailed instructions are much needed.

@RobenusW
Copy link
Author

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

Ok I realized I am a little confused. I thought a created a new branch for this issue

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

@RobenusW Also just as a note please only screenshot changes if changed have been made to the website, so no pictures of code are needed

Took them out, thanks for the feedback.

@blulady
Copy link
Member

blulady commented Jul 18, 2022

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

I see. Should I create a new merge request using the correct branch or what should I do? Detailed instructions are much needed.
@RobenusW
Ok so we have 2 options. You can rename the branch in GitHub or you can rename the branch in your local repo (online guide) To rename your branch locally you would

  • get on the branch you are trying to rename (in this case hackforla-RobenusW-patch-1)
  • then type git branch -m update-env-impact-yml-3362
  • then you can push it up to git, start with git push, git will then provide the appropriate command for you to use
  • it will then give you an option of commands, use this one "git push origin HEAD"
  • this will create a new pr which I will then approve and merge
    or (directions here)
  • go to the main page of the repo (the one that says website)
  • click on branches
  • then click on the pencil (on the right side)

Personally I would probably change it in github

@RobenusW
Copy link
Author

The changes look great but the branch name doesn't follow our typical scheme. You can read about standard scheme here

I see. Should I create a new merge request using the correct branch or what should I do? Detailed instructions are much needed.

Ok so we have 2 options. You can rename the branch in GitHub or you can rename the branch in your local repo (online guide) To rename your branch locally you would

  • get on the branch you are trying to rename (in this case hackforla-RobenusW-patch-1)
  • then type git branch -m update-env-impact-yml-3362
  • then you can push it up to git, start with git push, git will then provide the appropriate command for you to use
  • it will then give you an option of commands, use this one "git push origin HEAD"
  • this will create a new pr which I will then approve and merge
    or (directions here)
  • go to the main page of the repo (the one that says website)
  • click on branches
  • then click on the pencil (on the right side)

Personally I would probably change it in github

Thanks for your feedback and time. I came across a problem when I was following your steps, it says I can't rename my patch branch because only admins can rename protected branches. What should I do to solve that? Thanks for your detailed steps above.

@BeckettOBrien
Copy link
Member

I think that error is happening because the branch you are renaming is on the official hackforla github and not your own fork. This can happen if you accidentally have the hackforla github set as the origin. Can you send the output of git remote -v?

@blulady
Copy link
Member

blulady commented Jul 18, 2022

I think that error is happening because the branch you are renaming is on the official hackforla github and not your own fork. This can happen if you accidentally have the hackforla github set as the origin. Can you send the output of git remote -v?

@RobenusW This is probably the issue. If you can't get it working, let me know and we can do a screen share later.

@AsherEngelberg AsherEngelberg self-requested a review July 18, 2022 18:26
@RobenusW
Copy link
Author

  • update-env-impact-yml-3362

I see. Thanks for the feedback beyond your duty. I'm going to work through this as much as possible and will update you if I need additional help.

@blulady
Copy link
Member

blulady commented Jul 20, 2022

  • update-env-impact-yml-3362

I see. Thanks for the feedback beyond your duty. I'm going to work through this as much as possible and will update you if I need additional help.

Totally, but if you spend more than 45 minutes on it, reach out.

@RobenusW
Copy link
Author

  • update-env-impact-yml-3362

I see. Thanks for the feedback beyond your duty. I'm going to work through this as much as possible and will update you if I need additional help.

Totally, but if you spend more than 45 minutes on it, reach out.

Hey, I tried to fix this issue, but I kinda afraid I am going to mess some things up. Can we schedule a meeting to fix this? Thanks for your patience and help

@blulady
Copy link
Member

blulady commented Jul 23, 2022

  • update-env-impact-yml-3362

I see. Thanks for the feedback beyond your duty. I'm going to work through this as much as possible and will update you if I need additional help.

Totally, but if you spend more than 45 minutes on it, reach out.

Hey, I tried to fix this issue, but I kinda afraid I am going to mess some things up. Can we schedule a meeting to fix this? Thanks for your patience and help

Absolutely. I have obligations today. You are welcome to attend the Sunday meeting or we can set up a meeting after.

@RobenusW
Copy link
Author

RobenusW commented Jul 24, 2022

I am not able to come to most Sunday meetings, so I am free all week after 4:30, except Friday.

@blulady
Copy link
Member

blulady commented Jul 24, 2022

I am not able to come to most Sunday meetings, so I am free all week after 4:30, except Friday.

Hey is that PST or....
I could do Monday at 4:30 PST. Let me know if that works for you.

@RobenusW
Copy link
Author

Yes, 4:30 pst works, hope its not too late to respond. Tell me if you can't make it anymore.

@blulady
Copy link
Member

blulady commented Jul 25, 2022

It's good. Chat with you tomorrow at 4:30.

@blulady
Copy link
Member

blulady commented Jul 25, 2022

Yes, 4:30 pst works, hope its not too late to respond. Tell me if you can't make it anymore.

I sent a zoom link to (what I think is) you on slack.

@blulady
Copy link
Member

blulady commented Jul 25, 2022

accidently made this pr from website repo

@blulady blulady closed this Jul 25, 2022
@blulady blulady deleted the RobenusW-patch-1 branch November 22, 2022 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Good for newcomers P-Feature: Credit https://www.hackforla.org/credits/ role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Edit content field and remove type field from environmental-impact.yml credits file
5 participants