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

sima bio added #262

Merged
merged 8 commits into from
Jun 17, 2024
Merged

sima bio added #262

merged 8 commits into from
Jun 17, 2024

Conversation

SimaRaha
Copy link
Contributor

@SimaRaha SimaRaha commented Jun 7, 2024

Sima pic and bio added to the CCV website.

@SimaRaha SimaRaha requested a review from galenwinsor June 7, 2024 14:39
@SimaRaha
Copy link
Contributor Author

SimaRaha commented Jun 7, 2024

@galenwinsor Please review my changes and let me know the next steps.

Copy link
Contributor

@galenwinsor galenwinsor left a comment

Choose a reason for hiding this comment

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

Looks good Sima, just resolve that merge conflict and fix the image file extension. Feel free to reach out to me if you have questions.

about/people.yml Outdated
Comment on lines 433 to 443
<<<<<<< HEAD
name: Sima Raha
type: Part Time
team: Advanced Research Computing
subteam: Graphics, Software, and Data Core
title: Software Sustanibaility Intern
github_username: SimaRaha
brown_directory_uuid: cf68285e-47c5-4a65-897e-187c94e4f36b
bio: Sima Raha is a Software Sustainability Intern at CCV. She is Class of 2025, studying Economics and Data Fluency at Brown University. Her career interests include quantitative analysis, business intelligence (BI) development, and statistical programming. She enjoys hiking, nature photography, playing frisbee, and billiards.
image: sima_main.jpg
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there's still a merge conflict marker here on line 433 and 443. The <<<<< HEAD line means "the following changes come from the current branch, until the ===== line." You need to delete lines 433 and 443 in order to resolve the merge conflict.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, and line 472.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@galenwinsor I already have line 433 in my local code. And the line 443 does not work for me to delete it. So, do I need to push the change to github?

Copy link
Contributor

Choose a reason for hiding this comment

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

Make sure the file extension matches between the hover and main photo. In this case, make the extension of this file lowercase.

Copy link

github-actions bot commented Jun 10, 2024

Visit the preview URL for this PR (updated for commit d91cb2a):

https://ccv-brown-edu--pr262-simaccvcontaint-njuezl5q.web.app

(expires Mon, 24 Jun 2024 15:00:24 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: e6225babbaf68dadb99b2906d33811740e5d15cb

@SimaRaha SimaRaha requested a review from galenwinsor June 10, 2024 14:19
@SimaRaha
Copy link
Contributor Author

@galenwinsor I'm curious why my bio doesn't appear on the website.

@eldu
Copy link
Contributor

eldu commented Jun 13, 2024

@galenwinsor I'm curious why my bio doesn't appear on the website.

@SimaRaha You need to merge this PR into main in order for it to show up on the actual website. Looks like you'll need to resolve conflicts prior to merging this in

about/people.yml Outdated Show resolved Hide resolved
@SimaRaha SimaRaha merged commit bf4f0d0 into main Jun 17, 2024
12 checks passed
@SimaRaha SimaRaha deleted the simaccvcontaint branch June 17, 2024 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants