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.

Sign up for GitHub

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

Jump to bottom

Added Rhoda Michael's profile to guides team #5733

Merged
merged 6 commits into from
Oct 30, 2023
Merged

Added Rhoda Michael's profile to guides team #5733

merged 6 commits into from
Oct 30, 2023

Conversation

sakibian
Copy link
Member

@sakibian sakibian commented Oct 18, 2023 •
edited
Loading

Fixes #5623

What changes did you make?

  • Added Rhoda Michael's profile on the guides team board

Why did you make the changes (we will use this info to test)?

  • Information was not there, added a new name to the board

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

Visuals before changes are applied

image

Visuals after changes are applied

image

@sakibian sakibian added good first issue Good for newcomers role: back end/devOps Tasks for back-end developers P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) time sensitive Needs to be worked on by a particular timeframe P-Feature: Projects page https://www.hackforla.org/projects/ size: 0.25pt Can be done in 0.5 to 1.5 hours p-feature: Projects-check We use this page to check to make sure that teams are using the Technology section correctly labels Oct 18, 2023
@sakibian sakibian self-assigned this Oct 18, 2023
@sakibian sakibian mentioned this pull request Oct 18, 2023
Closed
@t-will-gillis
Copy link
Member

t-will-gillis commented Oct 18, 2023 •
edited
Loading

Hey @sakibian I was reading through the comments on your previous PR, and notice that this still has a merge conflict. The confusion is happening because three PRs are updating the same file at the same time. The two before yours are: #5672 fixes #5624 adds "Sarah Levine", so their name should stay. #5671 fixes #5584 removes "Shawn Wong", so this person's name should be removed.

To fix this:

  • First, as you note- please close your previous PR Added Rhoda Michael profile on guides team #5692
  • Next, to resolve the conflict scroll down this page and select "Resolve conflicts"
  • On the next page, you want to keep the profile you added: "Rhoda Michael", and delete the profile that has already been deleted from the Hack for LA website: "Shawn Wong".
    • Edit this page by deleting lines 42-43 first, then delete lines 29-35. The remaining info is six lines for "Rhoda Michael".
    • "Sarah Levine"s info is on lines 23-28. This does not change.
  • When done, scroll up and select "Mark as resolved". This should clear up the conflict.

@sakibian
Copy link
Member Author

@t-will-gillis Instruction followed according to your guide, thanks. Cheers.

@Thinking-Panda
Copy link
Member

Availability: weekdays
Review ETA: EOD 10/18

Thinking-Panda
Thinking-Panda previously requested changes Oct 18, 2023
View reviewed changes
Copy link
Member

@Thinking-Panda Thinking-Panda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sakibian , Thank you for your patience in working wit this issue. The code changes show the expected results on my machine. Minor change: Could you please update the visuals of the before and after change to reflect the current status.

@sakibian
Copy link
Member Author

@Thinking-Panda I have updated them, before was not change in this situation because it is from live server screenshot, I did update the after changes screenshot.

@KyleA99
Copy link
Member

KyleA99 commented Oct 18, 2023

Availability: 10/18/23
Review ETA: EOD 10/18/23

@KyleA99
Copy link
Member

KyleA99 commented Oct 19, 2023

Just looked over PR, the webpage does appear as desired. However, I believe your code is missing the github-handle from the issue action items (see below). Add that last info in and I think this PR can be merged

KyleA99
KyleA99 suggested changes Oct 19, 2023
View reviewed changes
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing github info for Rhoda Michael. Check issue action item

@sakibian
Copy link
Member Author

Missing github info for Rhoda Michael. Check issue action item

@KyleA99 updated missing phrase.

@KyleA99
Copy link
Member

KyleA99 commented Oct 22, 2023

Availability: 10/22/23
Review ETA: EOD 10/22/23

KyleA99
KyleA99 suggested changes Oct 22, 2023
View reviewed changes
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sakibian I believe Sarah Levine's info was omitted (possibly due to merge conflict again?), but I do see the github-handle correctly added for Rhoda. I think it will be approved once Sarah's info is added back in.

roslynwythe
roslynwythe previously requested changes Oct 24, 2023
View reviewed changes
Copy link
Member

@roslynwythe roslynwythe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sakibian I believe @KyleA99 is correct and you may have removed Sarah Levine's information while resolving the merge conflict.
You have several choices: (1) You can add back Sarah Levine's information. You can find that information in #5624 or from the diff in files changed. (2) You can close this Pull Request and start over again. If you do start over please start with an updated gh-pages branch and create an issue branch with a name that is distinct from the original one. Feel free to contact me on Slack for assistance.

Thank you @KyleA99 and @Thinking-Panda for your careful reviews.

@sakibian
Copy link
Member Author

@roslynwythe, @KyleA99 @Thinking-Panda added back to Sarah Levine's information.

@KyleA99 KyleA99 self-requested a review October 29, 2023 16:23
KyleA99
KyleA99 suggested changes Oct 29, 2023
View reviewed changes
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing Shawn Wong's info

@t-will-gillis
Copy link
Member

@sakibian @KyleA99

Shawn Wong's info should not be added back in- Shawn's info was removed by #5671 fixes #5584

@KyleA99
Copy link
Member

KyleA99 commented Oct 29, 2023

@t-will-gillis thank you. In that case, this PR is approved from what I saw. Thank you for the hard work and excellent communication on this @sakibian

KyleA99
KyleA99 approved these changes Oct 29, 2023
View reviewed changes
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, please ignore review-request I submitted earlier today. Looks great, thank you @sakibian

@t-will-gillis t-will-gillis self-requested a review October 30, 2023 03:51
t-will-gillis
t-will-gillis approved these changes Oct 30, 2023
View reviewed changes
Copy link
Member

@t-will-gillis t-will-gillis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @sakibian - Great job! Thank you for working with everyone to address the merge conflicts- and thank you for your persistence!

@t-will-gillis t-will-gillis dismissed stale reviews from roslynwythe and Thinking-Panda October 30, 2023 03:55

It appears @sakibian has addressed the merge conflicts and is good to go

@t-will-gillis t-will-gillis merged commit 31be48d into hackforla:gh-pages Oct 30, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KyleA99 KyleA99 KyleA99 approved these changes

@t-will-gillis t-will-gillis t-will-gillis approved these changes

@roslynwythe roslynwythe Awaiting requested review from roslynwythe

@Thinking-Panda Thinking-Panda Awaiting requested review from Thinking-Panda

Assignees

@sakibian sakibian

Labels
good first issue Good for newcomers P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) P-Feature: Projects page https://www.hackforla.org/projects/ p-feature: Projects-check We use this page to check to make sure that teams are using the Technology section correctly role: back end/devOps Tasks for back-end developers size: 0.25pt Can be done in 0.5 to 1.5 hours time sensitive Needs to be worked on by a particular timeframe
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Project Profile: Guides Team (Add Rhoda Michael)
5 participants
@sakibian @t-will-gillis @Thinking-Panda @KyleA99 @roslynwythe