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

add projects section and create a very pretty project card #3 #13

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

ShrushtiDesai
Copy link

This PR addresses the #3 issue.
It includes the following changes:

  • Enables navigation to different tabs and highlights the active tab while navigating.
  • Updates the logo to redirect to the home page when clicked.
  • Introduces a basic design for project cards.

Header and footer stays for every page, logo goes to homepage, tab stays active, box-shadow to header.
@Waqibsk
Copy link
Contributor

Waqibsk commented Jan 29, 2025

Hey @ShrushtiDesai , can you please resolve the merge conflicts.?

@ShrushtiDesai
Copy link
Author

ShrushtiDesai commented Jan 29, 2025

Hi @Waqibsk,
I'm having trouble understanding the exact merge conflicts. I synced my fork with the latest commits, and when I checked git status, it showed no conflicts to resolve. However, GitHub still indicates conflicts.
I'm not very experienced with GitHub—could you please guide me on the exact steps I need to take to resolve this?

@Waqibsk
Copy link
Contributor

Waqibsk commented Jan 31, 2025

1.Make sure you are on the correct branch.

2.Check if you have the upstream repository added:

git remote -v

3.If you don’t see "upstream" in the output, add it:

git remote add upstream (original-repo-url)

4.Now, pull the latest changes from the upstream repository into your branch:

git pull upstream main

Now i think it should show the conflicts in some files,after resolving them commit the changes and push the code

@ShrushtiDesai
Copy link
Author

Hi @Waqibsk, I followed your instructions, but no conflicts were displayed. However, this issue states, "The branch has conflicts that must be resolved." Below is the git graph for your reference. Let me know how to proceed.

image

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