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

Added verse of the day functionality, issue #165 #195

Closed
wants to merge 0 commits into from

Conversation

its-kritika
Copy link
Contributor

Resolves issue #165

I have added the Verse of the Day functionality to the application using React. Now on, everyday we will get a verse, better as 'Gita ka Gyaan' fetched randomly among the numerous shloks of Bhagvad Gita. This will enhance the user interaction making the application more familiar to the users.

Here I have shared the screenshot.
Screenshot (394)

Note: These verses will get updated at 12:00 AM everyday!!

Copy link

vercel bot commented May 23, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
vedic-vani-gagp ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 24, 2024 6:46pm

@its-kritika
Copy link
Contributor Author

its-kritika commented May 23, 2024

@sameer-soni
It is showing that branch has conflicts, do I need to resolve it to make a PR? Can you help me with that?

@Aditya13s
Copy link

@sameer-soni It is showing that branch has conflicts, do I need to resolve it to make a PR? Can you help me with that?

Try to rebase it using git rebase main

@its-kritika
Copy link
Contributor Author

its-kritika commented May 24, 2024

@sameer-soni It is showing that branch has conflicts, do I need to resolve it to make a PR? Can you help me with that?

Try to rebase it using git rebase main

The following msg is getting displayed -> 'Current branch main is up to date.' Do I need to bring changes of dev branch to main?

@Aditya13s
Copy link

Aditya13s commented May 24, 2024

use git fetch and then git pull

@its-kritika
Copy link
Contributor Author

It is yet showing that my branch is up to date. I think there are some changes coming from pr #149. I found that all other prs are made to main branch ( other than pr #149). Should I make a pr to main branch of this project?

@Aditya13s
Copy link

its-kritika wants to merge 1 commit into Omkar-Sonawane-23:Dev from its-kritika:main

you are pushing from your main branch to Dev brach of this project, either you have to rebase with this project's Dev branch or you can push your changes to main branch.

@its-kritika
Copy link
Contributor Author

its-kritika commented May 24, 2024

Okay I'll raise a pr to main branch

@its-kritika its-kritika reopened this May 24, 2024
@its-kritika its-kritika changed the base branch from Dev to main May 24, 2024 18:31
@its-kritika its-kritika changed the base branch from main to Dev May 24, 2024 18:44
@its-kritika its-kritika changed the base branch from Dev to main May 24, 2024 18:46
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.

2 participants