-
Notifications
You must be signed in to change notification settings - Fork 0
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 styling such as background color and font #6
base: main
Are you sure you want to change the base?
Conversation
I am confused what what is the current main is? The pull request that I sent showing there Is a conflict. Github is comparing my branch with Jason's html file I try to solve the conflict by pulling the latest main to my VS code/local. However what I see is the origin main branch that Fran created. I can't solve the conflict because there is no conflict between my branch (add-styling) and Fran's main branch. On the other hand, GitHub pull request ask me to solve the conflict between mine branch and Jason's main branch. Can anyone try to pull the main to local and check what version of main branch is it? ( Fran's or Jason's) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had already linked the stylesheet on the html file so when you tried to re-link, there was a conflict. I have resolved this now.
Jason I think you have to merge as I was the last pusher apparently... I am learning a lot! |
Thank you! Fran. |
@Luciensday did you checkout to main branch and pull again before you committed your changes? Maybe you didn't have the most up-to-date main branch before you did this? |
@Frannerz Omg thanks for the tip. You are my saviour! I check again and realised I haven't done I feel so silly I tried git checkout between main and my branch countless times and couldn't find the issue - Now I know the issue! yay |
@Luciensday Don't feel silly, that's exactly why I wanted to start this repo! I think we're doing pretty damn well. Sorry for the wait, I'm gonna review your code now. @Frannerz hahaha yeah I found that rule in the settings and I thought it'd be a good way to force us to collaborate |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't know about preconnect
, very cool
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol I don't know what's preconnect
neither. The whole snippet is copied from Google Font after I select the font I want.
Okay @Frannerz, @Estishi87 & @Luciensday, I made some readability changes to |
Now the ball is rolling! yay