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 styling such as background color and font #6

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

Conversation

Luciensday
Copy link
Contributor

Now the ball is rolling! yay

@Luciensday
Copy link
Contributor Author

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)

Copy link
Contributor

@Frannerz Frannerz left a 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.

@Frannerz
Copy link
Contributor

Jason I think you have to merge as I was the last pusher apparently... I am learning a lot!

@Luciensday
Copy link
Contributor Author

Thank you! Fran.
I am still confused why my local and remote's main are different. but I am glad the conflict is solved!

@Frannerz
Copy link
Contributor

@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?

@Luciensday
Copy link
Contributor Author

@Frannerz Omg thanks for the tip. You are my saviour! I check again and realised I haven't done git pull the whole time!!

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

@JasonWarrenUK
Copy link
Member

JasonWarrenUK commented Sep 16, 2023

@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

Copy link
Member

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

Copy link
Contributor Author

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.

@JasonWarrenUK
Copy link
Member

Okay @Frannerz, @Estishi87 & @Luciensday, I made some readability changes to styles.css, someone check them out and then I think we're good to merge.

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