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

fix: blog featured post #365

Closed
wants to merge 4 commits into from
Closed

fix: blog featured post #365

wants to merge 4 commits into from

Conversation

nickytonline
Copy link
Member

@nickytonline nickytonline commented Sep 16, 2024

Description

Related Tickets & Documents

Steps to QA

Tier (staff will fill in)

  • Tier 1
  • Tier 2
  • Tier 3
  • Tier 4

[optional] What gif best describes this PR or how it makes you feel?

Copy link

netlify bot commented Sep 16, 2024

Deploy Preview for opensauced-landing ready!

Name Link
🔨 Latest commit 75638c2
🔍 Latest deploy log https://app.netlify.com/sites/opensauced-landing/deploys/66e867940b87100008d3490c
😎 Deploy Preview https://deploy-preview-365--opensauced-landing.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

brandonroberts
brandonroberts previously approved these changes Sep 16, 2024
@brandonroberts brandonroberts changed the title fix blog featured post fix: blog featured post Sep 16, 2024
Copy link
Member

@jpmcb jpmcb left a comment

Choose a reason for hiding this comment

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

@nickytonline - you need to rebase this since it looks like you're carrying commits over from #358

@nickytonline
Copy link
Member Author

@nickytonline - you need to rebase this since it looks like you're carrying commits over from #358

Yeah, I accidentally used an old branch. 🙈 Just rebasing.

@nickytonline
Copy link
Member Author

nickytonline commented Sep 16, 2024

I think the GitHub UI is not reflecting my latest. Did another push force, but it still shows multiple commits here. 😅

CleanShot 2024-09-16 at 13 16 32

@jpmcb
Copy link
Member

jpmcb commented Sep 16, 2024

The tip of your fix-blog-featured-post has 4 commits (including those from [email protected]:

Screenshot 2024-09-16 at 11 18 57 AM

It looks like you picked these up from your branch being based on: #357 which is also getting your force pushes and has your pizza-action commit. So you probably started from a dirty state.

You could drop those commits in an interactive rebase:

d eb65f477 fix: fixed featured post img
d 00d046da Update components/sections/blog/components/Post.tsx
d e26af92c Update components/sections/blog/FeaturedPost.tsx
pick 75638c22 chore: updated pizza action

but it'd probably just be easier to throw out this branch, pull down from main and ensure you don't have other commits

@nickytonline
Copy link
Member Author

nickytonline commented Sep 16, 2024

Yeah, throwing it out.

@nickytonline nickytonline dismissed brandonroberts’s stale review September 16, 2024 17:23

I accidentally hijacked someone's PR

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.

4 participants