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

merge press and news pages #17

Merged
merged 11 commits into from
Aug 26, 2024
Merged

merge press and news pages #17

merged 11 commits into from
Aug 26, 2024

Conversation

Dindihub
Copy link
Owner

@Dindihub Dindihub commented Aug 19, 2024

This PR covers issue #15

I would appreciate your input @chalin @lukpueh

Copy link

netlify bot commented Aug 19, 2024

Deploy Preview for tufio ready!

Name Link
🔨 Latest commit 1b05559
🔍 Latest deploy log https://app.netlify.com/sites/tufio/deploys/66cd14e0c2252a0008a226a3
😎 Deploy Preview https://deploy-preview-17--tufio.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.

@Dindihub Dindihub requested review from lukpueh and chalin August 19, 2024 07:25
Copy link
Collaborator

@lukpueh lukpueh left a comment

Choose a reason for hiding this comment

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

Please fix the missing white space and check with @chalin about the aliases, otherwise, this looks great! :)

content/en/resources/news.md Outdated Show resolved Hide resolved
content/en/resources/news.md Outdated Show resolved Hide resolved
content/en/resources/news.md Outdated Show resolved Hide resolved
content/en/resources/publications.md Outdated Show resolved Hide resolved
content/en/resources/news.md Outdated Show resolved Hide resolved
@chalin chalin requested review from lukpueh and chalin August 23, 2024 20:36
Copy link
Collaborator

@chalin chalin left a comment

Choose a reason for hiding this comment

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

LGTM but I'd like for you to pull in the changes that I just merged first so that we can test the aliases. That is, the following should successfully redirect:

@Dindihub
Copy link
Owner Author

LGTM but I'd like for you to pull in the changes that I just merged first so that we can test the aliases. That is, the following should successfully redirect:

@chalin unfortunately, the aliases are not redirecting

@chalin
Copy link
Collaborator

chalin commented Aug 26, 2024

@chalin unfortunately, the aliases are not redirecting

You need to rebase in order for the aliases to start working.

@chalin
Copy link
Collaborator

chalin commented Aug 26, 2024

I've rebased for you. If you'd like to try it on your own another time, the commands to use are something like this:

git switch main
git pull
git switch press-news-merge
git rebase main
git push -f

@chalin
Copy link
Collaborator

chalin commented Aug 26, 2024

Aliases are working now, as expected. I believe that this addresses all previously raised concerns, so let's merge this now.

@chalin chalin merged commit c5dc4c7 into main Aug 26, 2024
6 checks passed
@chalin chalin deleted the press-news-merge branch August 26, 2024 23:55
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