This is the main repository for the FreeCodeCamp Ulsan group in South Korea. It contains all assets used in the Facebook group, as well as logos and more.
Feel free to contribute improvements via pull requests :)
If you're not sure how to do that or need help, try Google/Naver, or post in the group.
This may seem a bit confusing at first. Try it out, and if it doesn't work, ask for help in the group.
The easiest way is to just use the GitHub website.
- Edit any file in this repository on the GitHub website.
- Tell us about your change and submit it.
- Describe your changes in detail in the text input boxes at the bottom of the page.
- Click the green "Propose file change" button at the bottom of the page.
- Click the green "Create Pull Request" button
The instructions stem mostly from these tutorials and what worked for us at the meetup:
https://akrabat.com/the-beginners-guide-to-contributing-to-a-github-project/ https://gist.github.com/MarcDiethelm/7303312
-
Fork the FCC Ulsan main repository by clicking the "Fork" button in the top left of the page.
-
Clone the repository to your local machine
-
Configure the
origin
andupstream
correctly.-
origin
's URL should point to your fork, so the URL should have your GitHub account in it. -
upstream
's URL should point to the original repository, so the URL should behttps://github.com/fcculsan/main.git
. -
use
git remote
to see iforigin
andupstream
exist.- use
git remote get-url origin
andgit remote get-url upstream
to see what the URLs are.
- use
-
If
origin
orupstream
have the wrong URLs, you can rename them withgit remote rename (oldname) (newname)
or delete them withgit remote remove (origin/upstream)
and create them with the correct URL usinggit remote add (origin/upstream) (URL)
.
-
-
Push your local commit to your remote fork.
git push origin master
-
Go to your forked repository on the GitHub website.
-
Click the "Pull Request" button to the right of where you see "This branch is 1 commit ahead of fcculsan:master."
-
Click the green "Create Pull Request" button.
-
Describe your changes, and submit it.
-
You're done!
Sometimes others will make changes to the upstream
repository. They won't show up in your forked repository. You need to manually sync these changes. You can delete your forked repository directly on the GitHub website, then fork the upstream
repository again. This will give you a fresh copy of the upstream
repository that's up to date. Of course, you will lose any commits in your forked repository that weren't pulled into the upstream
.
The best way I know how to do this is via the command line.
- Ensure all the previous command line steps have been done correctly.
- Your local repository has 2 remote branches:
origin
andupstream
.-
origin
has aurl
including your username -
upstream
has theurl
https://github.com/fcculsan/main.git
-
- Your local repository has 2 remote branches:
- Fetch the
upstream
changesgit fetch upstream
- Make sure you're on the
master
branchgit checkout master
- Combine the
upstream
changes with the code you have locally onmaster
git rebase upstream/master
- Push your updated local repository to your forked version.
git push origin master
- DONE! You can continue writing code, committing, pushing, and doing pull requests as usual.