search

hackforla / website

Hack for LA's website
https://www.hackforla.org
GNU General Public License v2.0
286 stars 699 forks source link

Update Job Profiles on Civic Tech Jobs : Remove Tin Wei Chung; Add Armon Brown & Carmen MakRemove # 6639 #6801

Closed samuelusc closed 2 weeks ago

samuelusc commented 2 weeks ago

Fixes #6639

What changes did you make?

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

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

Visuals before changes are applied ![conflicts fixed - before](https://github.com/hackforla/website/assets/97491762/0e46f228-952a-47c1-a1f1-3dee2415a72d)
Visuals after changes are applied ![conflicts fixed - after](https://github.com/hackforla/website/assets/97491762/51c50d74-349d-4024-88b4-bb8082b80275)
github-actions[bot] commented 2 weeks ago

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 samuelusc-fix-issue-6639 gh-pages
git pull https://github.com/samuelusc/website-project.git fix-issue-6639
LRenDO commented 2 weeks ago

Hi @samuelusc! Thanks for submitting this PR. When you have a moment, please edit the title of the PR to be descriptive of the changes made in the PR. For the future, we also use a descriptive branch name with the issue number included.

Additionally, I just merged a PR in this same file so there is a now a conflict in your PR. Please update your topic branch and push the changes when you get a chance. For instructions on updating your topic branch, see Incorporating changes into your topic branch. Feel free to ping me here or on Slack if you need help.

samuelusc commented 2 weeks ago

@LRenDO Hi LRenDO, Thank you for your guidance. I have updated the title of the PR to better reflect the changes made. Additionally, I have resolved the merge conflicts that arose after a recent merge in the same file and have force-pushed the updates to ensure that the fix-issue-6639 branch is now fully aligned with the latest upstream/gh-pages.

Next time I will use more descriptive branch name with the issue number included and appreciate your suggestion. Please let me know if there's anything more to adjust or if further review is needed.

A-Wu5 commented 2 weeks ago

Availability: Th & Weekend 8pm-10pm ETA: Th EOD

LRenDO commented 2 weeks ago

Hi @samuelusc! thank you for taking care of the merge conflict! I went ahead and responded to your message in Slack with some non-functional notes, since it looks like the title change didn't stick and you may have a linter that is removing whitespace automatically.

samuelusc commented 2 weeks ago

@LRenDO Thanks for your feedback. I've edited the title as you suggested and turned off the automatic removal of whitespace in my editor. Should I manually add the spaces back according to the diffs shown in the Git commits and push the PR again? Please let me know how you'd like to proceed.

samuelusc commented 2 weeks ago

@jphamtv Thank you, Jpham. I just saw your message. I've updated it accordingly, and I'll be more mindful of extraneous changes in the future. Thanks for your guidance!