main GiftAPad repository. This is the project carried out by members of #team_berlin in the three weeks start.ng pre internship programme. This project was built remotely by each contributor thanks to githubcd main_filescd main_files FOR TEAM MEMBERS... Thank you for coming, please attach screen shot while making a pull request. Also use the main.css to style all your codes. Don't forget to comment on your part
#Username on Slack - @Francis-Xavier #I created the contact page, edited the about and index page, changed main.css to style.css and created a separate stylesheet called contact.css for contact page located in the css folder.
#slack username: Taofeeq-deru #I added the donation page and also added the stylesheet for the donation page css folder. Also added font-awesome-4.7.0 which I used in creating the donation page
#Username on Slack - @Francis-Xavier #I created the project.html page and project.css. Added hr styling to the footers. Updated the team page with my details.
go to https://github.com/giftapad/main_files , fork the repository by clicking on the fork button at the top of the page,
go to your forked repository on your Github profile and copy the URL to your forked repository, from clone or download button
then go to your terminal on your computer and type
git clone "url you just copied" e.g git clone https://github.com/your-username/main_files.git .
on your terminal, type cd main_files , then create a new branch by using git checkout command, git checkout -b <name-of-new-branch> , e.g git checkout -b add-raphael
open the folder on your favourite code editor and navigate to team.html,
add your link to your cloudinary photo (replace, the default link), Add your name and track, then save.
Go to the terminal and enter git status command, you should see the unstaged files highlighted in red.
stage the changed file by using the command git add . or just git add team.html
(using git status command again, will show the files changed highlighted in green)
commit the files using git commit -m 'your-commit-message' e.g git commit -m 'add-raphael-profile'
push your changes to github using git push command
i.e git push origin <your-branch-name> replacing with the name of the branch you created earlier, e.g git push origin add-raphael
If you go to your repository on github, you should see compare & pull request button, click on it
Now submit the pull request by clicking on create pull request button , remember to add a screenshot of the team.html page after your effected changes when opened in browser.
Soon, your changes will be merged by the team lead @Ezeko or his deputies.
CONGRATS ON YOUR FIRST CONTRIBUTION!!!
Check for tasks on #teamberlin's workspace, collaboration will follow this standard fork-clone-create new branch-edit-commit-pullRequest workflow.
After Forking and cloning your repository, you start contributing to the main repository and after a while, you notice that your forked repository and the upstream repository are not in sync anymore, usually noticed when your branch have conflicts with the main branch. This guide will make you get the current version of the upstream repository.
The original repository is mostly called upstream . In our case, that would be https://github.com/giftapad/main_files.git , cd into your forked repository, you should preferably be on the master branch. To add upstream you use the command;
git remote add upstream git://github.com/giftapad/main_files.git
Using the git remote -v command after, you should see the following;
if you made any mistakes in the URL when adding the upstream, you could always use git remote remove upstream , and repeat the process again .
Now that we have both URLs, we can now use the command git fetch upstream to fetch all the changes from the upstream and then we merge the changes using:
git merge upstream/master master.
you can do all this with just git pull i.e git pull upstream master
After the previous step, if you type the command git status , you should get a message like;
This is because, you have only updated your local repository, to update your remote repository, that is the one on GitHub,you will have to use git push command i.e git push -u origin master.
refreshing your remote repository on GitHub should show that your branch is even with giftapad:master.