-
Notifications
You must be signed in to change notification settings - Fork 96
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
Fixed #7 Added the mentors section #13
Conversation
https://stedirisuriya.github.io/gci18.fossasia.org/ Here is the preview link. |
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.
Please only change the mentors section. Don't change or add any unnecessary files. There are 586 files changed here!
I did changes |
A mentors section needs to contain - mentors. Simply adding placeholders does not make sense. We already have sample html in the repo. |
@mariobehling sir, |
@mariobehling and @YashKumarVerma Thanks, I added six mentors from gci17 site Have a look now. |
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.
Great work @STEdirisuriya
@STEdirisuriya just add one mentor, who is a mentor this year as well. We don't need past years mentor names here. |
Yes, rest looks good to me. @STEdirisuriya add Gemfile to gitignore |
@mariobehling please review |
|
@mariobehling please have a look again! |
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.
Looks Good to Me
LGTM @mariobehling. |
#14 |
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.
Please rebase your branch with upstream by git pull --rebase upstream master
then push it to your forked repo.
Open the website, mentors section is already there. You can change UI or upgrade it by creating a new issue and send another PR. |
I claimed the issue first and make the PR. Then how there is a another one? Another PR gets merged first. That was the reason. Kindly give me a solution. |
@liveHarshit On the deployed https://gci18.fossasia.org/ I don't see a mentor section, maybe you mean the gci17 site? |
@tabesin He is telling about an another PR. But there is a problem. I claimed the issue first and make the PR. You can see the issue here. #7 |
Guys, this is the comment section about this PR which is about the mentor section for the GCI18 site. The review of Mario has been resolved as far as I could see as only 10 files are changed. I also don't see an existing mentor section at the deployed site and there seem to be no merge conflicts. Other PR and other repositories are irrelevant here. |
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.
Please rebase it with upstream and change commit message to Update mentor section. Cannot be merged without rebasing because it is conflict with the base branch.
I reabse it already. |
This branch has conflicts that must be resolved - |
Resolved. Please review now @liveHarshit |
Drop your 2 commits. Then rebase it after that again commit it with update mentor section message then push it. It is still showing conflicts. |
@liveHarshit OK. resolved again |
I told you to change commit message to |
@liveHarshit |
I used jekyll and added mentors section as this (issue[https://github.com//issues/7]).
So I
jekyll build
it for first time. So It shows lot of changes in this PRThanks!