Skip to content

Conversation

@Khinememe-Kyaw
Copy link
Member

@Khinememe-Kyaw Khinememe-Kyaw commented Feb 10, 2025

Fixes #7849

What changes did you make?

  • Added Brad Morgan in VRMS leadership

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

  • To Keep VRMS up to date

CodeQL Alerts

After the PR has been submitted and the resulting GitHub actions/checks have been completed, developers should check the PR for CodeQL alert annotations.

Check the PR's comments. If present on your PR, the CodeQL alert looks similar as shown

Screenshot 2024-10-28 154514

Please let us know that you have checked for CodeQL alerts. Please do not dismiss alerts.

  • I have checked this PR for CodeQL alerts and none were found.
  • I found CodeQL alert(s), and (select one):
    • I have resolved the CodeQL alert(s) as noted
    • I believe the CodeQL alert(s) is a false positive (Merge Team will evaluate)
    • I have followed the Instructions below, but I am still stuck (Merge Team will evaluate)
Instructions for resolving CodeQL alerts

If CodeQL alert/annotations appear, refer to How to Resolve CodeQL alerts.

In general, CodeQL alerts should be resolved prior to PR reviews and merging

Screenshots of Proposed Changes To The Website (if any, please do not include screenshots of code changes)

Visuals before changes are applied

image

Visuals after changes are applied

image

@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 Khinememe-Kyaw-VRMS-add-7849 gh-pages
git pull https://github.com/Khinememe-Kyaw/website.git VRMS-add-7849

@github-actions github-actions bot added good first issue Good for newcomers role: front end Tasks for front end developers 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 size: 0.25pt Can be done in 0.5 to 1.5 hours labels Feb 10, 2025
@aadilahmed aadilahmed self-requested a review February 10, 2025 08:08
@aadilahmed
Copy link
Member

Review ETA: EOD 2/12/25
Availability: 9-5 PM Monday-Friday

DrAcula27
DrAcula27 previously approved these changes Feb 10, 2025
Copy link
Member

@DrAcula27 DrAcula27 left a comment

Choose a reason for hiding this comment

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

@Khinememe-Kyaw Great job on your Good First Issue! Your code passed the ABC's, including:

  • PR is made from the correct branch
  • PR links to the correct issue:
  • The correct file _projects/vrms.md was edited
  • No extra edits were made
  • Appearance of the website looks good (Chrome and Firefox)
    Approved! 👍

@rogerioduenas
Copy link
Member

Hi @DrAcula27,

I resolved a conflict in this PR and your previous review was canceled. I apologize for any inconvenience. I hope I didn't make any mistakes, as I’m new here and still getting used to the workflow. If possible, could you review it again?

Thank you for your understanding! 😁

aadilahmed
aadilahmed previously approved these changes Feb 13, 2025
Copy link
Member

@aadilahmed aadilahmed left a comment

Choose a reason for hiding this comment

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

Good job on your first issue @Khinememe-Kyaw ! You added the new profile to the leadership section of the VRMS project page, and correctly created the pull request. Great work!

DrAcula27
DrAcula27 previously approved these changes Feb 13, 2025
Copy link
Member

@DrAcula27 DrAcula27 left a comment

Choose a reason for hiding this comment

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

@Khinememe-Kyaw Great job on your Good First Issue! Your code passed the ABC's, including:

  • PR is made from the correct branch
  • PR links to the correct issue:
  • The correct file _projects/vrms.md was edited
  • No extra edits were made
  • Appearance of the website looks good (Chrome and Firefox)
    Approved! 👍

@LRenDO
Copy link
Member

LRenDO commented Feb 13, 2025

Hi @Khinememe-Kyaw! I just merged an older PR that changed this file and it created a conflict. Please pull the upstream gh-pages into your local gh-pages and incorporate the changes into your local VRMS-add-7849 branch and push your local VRMS-add-7849 again. It should automatically add the changes to this PR. Feel free to reach out directly to me on Slack if you have any questions!

@Khinememe-Kyaw Khinememe-Kyaw dismissed stale reviews from DrAcula27 and aadilahmed via 0b32656 February 13, 2025 11:55
@Khinememe-Kyaw
Copy link
Member Author

I have pulled the upstream gh-pages and pushed the VRMS-add-7849 branch. But I'm not sure if the issue is resolved. I noticed that the two approved reviews are gone and the message about the branch having conflicts is still there. Could you please let me know if there is anything else I have to fix? Thank you!

DrAcula27
DrAcula27 previously approved these changes Feb 15, 2025
Copy link
Member

@DrAcula27 DrAcula27 left a comment

Choose a reason for hiding this comment

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

@Khinememe-Kyaw PR still looks good to me. Thanks!

@Sujay-Anantha Sujay-Anantha self-requested a review February 16, 2025 00:14
Sujay-Anantha
Sujay-Anantha previously approved these changes Feb 16, 2025
Copy link
Member

@Sujay-Anantha Sujay-Anantha left a comment

Choose a reason for hiding this comment

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

@Khinememe-Kyaw Great Job on the PR. Things you did well:

  • The PR was created from the correct branch and properly linked to the corresponding issue (#7849 ).
  • Only the specified section in _projects/vrms.md was updated with no unnecessary changes.
  • Verified that the changes align with the attached screenshot.
  • CodeQL alerts have been checked.

@t-will-gillis
Copy link
Member

t-will-gillis commented Feb 17, 2025

Hi @Khinememe-Kyaw You wrote:

I have pulled the upstream gh-pages and pushed the VRMS-add-7849 branch. But I'm not sure if the issue is resolved. I noticed that the two approved reviews are gone and the message about the branch having conflicts is still there. Could you please let me know if there is anything else I have to fix? Thank you!

Unfortunately, yes, you still have conflicts that need to be resolved before this can be merged. You can try to resolve the conflict with the "Checkout via command line" note below, and/or if you are attending the Tuesday or Thursday meeting this week someone can help you with this.

Screenshot of merge conflict notes

Screenshot 2025-02-16 185346

If all else fails, there is the option of closing this PR, and then starting over with a new branch, make the edits, and submit a new PR.

@Khinememe-Kyaw
Copy link
Member Author

Khinememe-Kyaw commented Feb 17, 2025

Screenshot 2025-02-16 at 8 59 08 PM @t-will-gillis I am sorry I have only work on project alone and I don't know how to solve merge conflict. Please let me know whatI can do to solve it. Thank you! And yes, I will be at the meeting on Tuesday

@t-will-gillis
Copy link
Member

@Khinememe-Kyaw No problem- sometimes the merge conflicts get messy. If you are going on Tuesday, be sure to let the host know that you need help with a merge conflict.

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: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) role: back end/devOps Tasks for back-end developers role: front end Tasks for front 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

Development

Successfully merging this pull request may close these issues.

Update Project Profile: VRMS Add Brad Morgan

9 participants