forked from firstcontributions/first-contributions
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-typos-in-german-translation
- Loading branch information
Showing
31 changed files
with
3,386 additions
and
450 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
additional-material/git_workflow_scenarios/why-using-branches.MD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # WHY USING BRANCHES DURING CONTRIBUTING | ||
|
|
||
| Branches are simply pointers to a commit. | ||
|
|
||
| When you branch out, git is essentially making a new state of your current code, upon which you can work, without affecting the important main state of the code (which is in master branch). | ||
|
|
||
| When your happy with your experiments, and want to merge you experiments in main code, you run git merge | ||
| <branch name> master. | ||
| This will tell git, to add in all changes from your experiment branch into master. | ||
|
|
||
| This way, while working in a open source project with a number of contributers, it becomes easy to merge the best suited code without altering the main code or master branch. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule start-here-guidelines
deleted from
333c63
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| [](https://github.com/ellerbrock/open-source-badges/) | ||
| [<img align="right" width="150" src="../assets/join-slack-team.png">](https://join.slack.com/t/firstcontributors/shared_invite/enQtMzE1MTYwNzI3ODQ0LTZiMDA2OGI2NTYyNjM1MTFiNTc4YTRhZTg4OWZjMzA0ZWZmY2UxYzVkMzI1ZmVmOWI4ODdkZWQwNTM2NDVmNjY) | ||
| [](https://opensource.org/licenses/MIT) | ||
| [](https://www.codetriage.com/roshanjossey/first-contributions) | ||
|
|
||
|
|
||
| # Eerste Bydraes | ||
|
|
||
| Dit is moeilik. Dit is altyd moeilik om die eerste keer iets te doen. Veral wanneer jy saamwerk, maak foute nie 'n gemaklike ding nie. Ons wou die manier waarop nuwe open source bydraers vir die eerste keer leer en bydra, vereenvoudig. | ||
|
|
||
| Lees artikels en kyk tutoriale kan help, maar wat is beter as om die goed in die praktyk te doen? Hierdie projek het ten doel om leiding te gee en die manier waarop beginners hul eerste bydrae maak, te vereenvoudig. As jy jou eerste bydrae wil maak, volg die onderstaande stappe. | ||
|
|
||
| #### *As jy nie gemaklik is met die opdraglyn nie, [is daar tutoriale wat GUI-instrumente gebruik.]( #tutorials-using-other-tools )* | ||
|
|
||
| #### *Lees dit in [ander tale .](translations/Translations.md).* | ||
|
|
||
| [🇮🇳](translations/README.hi.md) | ||
| [🇲🇲](translations/README.mm_unicode.md) | ||
| [🇮🇩](translations/README.id.md) | ||
| [🇫🇷](translations/README.fr.md) | ||
| [🇪🇸](translations/README.es.md) | ||
| [<img src="../assets/catalan1.png" width="22">](translations/README.ca.md) | ||
| [🇳🇱](translations/README.nl.md) | ||
| [🇱🇹](translations/README.lt.md) | ||
| [🇷🇺](translations/README.ru.md) | ||
| [:slovakia:](translations/README.slk.md) | ||
| [🇯🇵](translations/README.ja.md) | ||
| [🇻🇳](translations/README.vn.md) | ||
| [🇵🇱](translations/README.pl.md) | ||
| [🇮🇷](translations/README.fa.md) | ||
| [🇮🇷](translations/README.fa.en.md) | ||
| [🇰🇷 🇰🇵](translations/README.ko.md) | ||
| [🇩🇪](translations/README.de.md) | ||
| [🇩🇰](translations/README.da.md) | ||
| [🇨🇳](translations/README.chs.md) | ||
| [🇹🇼](translations/README.cht.md) | ||
| [🇬🇷](translations/README.gr.md) | ||
| [🇪🇬](translations/README.eg.md) | ||
| [🇸🇦](translations/README.ar.md) | ||
| [🇺🇦](translations/README.ua.md) | ||
| [🇧🇷](translations/README.pt_br.md) | ||
| [🇵🇹](translations/README.pt-pt.md) | ||
| [🇮🇹](translations/README.it.md) | ||
| [🇹🇭](translations/README.th.md) | ||
| [🏴](translations/README.gl.md) | ||
| [🇵🇰](translations/README.ur.md) | ||
| [:bangladesh:](translations/README.bn.md) | ||
| [🇲🇩 🇷🇴](translations/README.ro.md) | ||
| [🇹🇷](translations/README.tr.md) | ||
| [🇸🇪](translations/README.se.md) | ||
| [:slovenia:](translations/README.sl.md) | ||
| [🇮🇱](translations/README.hb.md) | ||
| [🇨🇿](translations/README.cs.md) | ||
| [<img src="../assets/pirate.png" width="22">](translations/README.en-pirate.md) | ||
| [🇲🇽](translations/README.mx.md) | ||
| [🇿🇦](translations/README.zul.md) | ||
| [🇿🇦](translations/README.afk.md) | ||
| [🇰🇪](translations/README.kws.md) | ||
| [🇳🇬](translations/README.igb.md) | ||
|
|
||
|
|
||
|
|
||
| <img align="right" width="300" src="../assets/fork.png" alt="fork this repository" /> | ||
|
|
||
| As jy nie git op jou masjien het nie, [installeer dit]( https://help.github.com/articles/set-up-git/). | ||
|
|
||
| ## Vork hierdie bewaarplek | ||
|
|
||
| Vork hierdie repo deur op die vurk knoppie bo-aan hierdie bladsy te klik. Dit sal 'n kopie van hierdie repository in u rekening skep. | ||
|
|
||
| ## Klone die repository | ||
|
|
||
| <img align="right" width="300" src="../assets/clone.png" alt="clone this repository" /> | ||
|
|
||
| Klone nou die vurk repo aan jou masjien. Gaan na jou GitHub-rekening, maak die vurk repo oop, klik op die kloonknop en klik dan op die kopie na die knipbord- ikoon. | ||
|
|
||
| Open 'n terminaal en voer die volgende git opdrag uit: | ||
|
|
||
| ``` | ||
| git clone "url you just copied" | ||
| ``` | ||
|
|
||
| waar "url jy net gekopieer" het (sonder die aanhalingstekens) is die url na hierdie repository (jou vurk van hierdie projek). Sien die vorige stappe om die url te verkry. | ||
|
|
||
| <img align="right" width="300" src="../assets/copy-to-clipboard.png" alt="copy URL to clipboard" /> | ||
|
|
||
| Byvoorbeeld: | ||
|
|
||
| ``` | ||
| git clone https://github.com/this-is-you/first-contributions.git | ||
| ``` | ||
|
|
||
| waar `this-is-youis` jou GitHub gebruikersnaam Hier kopieer jy die inhoud van die eerste bydrae repository in GitHub na jou rekenaar. | ||
|
|
||
| ## Skep 'n tak | ||
|
|
||
| Verander na die repository gids op jou rekenaar (as jy nie reeds daar is nie): | ||
|
|
||
| ``` | ||
| cd first-contributions | ||
| ``` | ||
|
|
||
| Skep nou 'n tak met die git `checkout` opdrag: | ||
|
|
||
| ``` | ||
| git checkout -b <add-your-new-branch-name> | ||
| ``` | ||
|
|
||
| Byvoorbeeld: | ||
|
|
||
| ``` | ||
| git checkout -b add-alonzo-church | ||
| ``` | ||
|
|
||
| (Die naam van die tak hoef nie die woord by te voeg nie, maar dit is 'n redelike ding om in te sluit omdat die doel van hierdie tak is om jou naam by 'n lys te voeg.) | ||
|
|
||
| ## Maak die nodige veranderinge en verbind die veranderinge | ||
|
|
||
| Nou oop `Contributors.md` lêer in 'n teksredigeerder, voeg jou naam daarby. Moet dit nie aan die begin of einde van die lêer byvoeg nie. Sit dit oral tussenin. Stoor nou die lêer. | ||
|
|
||
| <img align="right" width="450" src="../assets/git-status.png" alt="git status" /> | ||
|
|
||
| As u na die projekgids gaan en die opdrag uitvoer `git status`, sal u sien dat daar veranderinge is. | ||
|
|
||
|
|
||
| Voeg die veranderinge by die tak wat jy net geskep het deur die `git add` opdrag te gebruik: | ||
|
|
||
| ``` | ||
| git add Contributors.md | ||
| ``` | ||
|
|
||
| Doen nou die veranderinge deur die `git commit` opdrag te gebruik: | ||
|
|
||
| ``` | ||
| git commit -m "Add <your-name> to Contributors list" | ||
| ``` | ||
|
|
||
| vervang `<your-name>` met jou naam. | ||
|
|
||
| ## Druk veranderinge na GitHub | ||
|
|
||
| Druk jou veranderinge deur die opdrag te gebruik `git push`: | ||
|
|
||
| ``` | ||
| git push origin <add-your-branch-name> | ||
| ``` | ||
|
|
||
| vervang `<add-your-branch-name>` met die naam van die tak wat jy vroeër geskep het. | ||
|
|
||
| ## Dien jou veranderinge in vir hersiening | ||
|
|
||
| As jy na jou repository op GitHub gaan, sal jy 'n `Compare & pull` requestknoppie sien. Klik op daardie knoppie. | ||
|
|
||
| <img style="float: right;" src="../assets/compare-and-pull.png" alt="create a pull request" /> | ||
|
|
||
| Dien nou die trekversoek in. | ||
|
|
||
| <img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" /> | ||
|
|
||
| Binnekort sal ek al jou veranderinge in die meestertak van hierdie projek saamsmelt. U sal 'n kennisgewing-e-pos ontvang sodra die veranderinge saamgesmelt is. | ||
|
|
||
| ## Waarheen gaan jy vandaan? | ||
|
|
||
| Geluk! Jy het net die standaardvurk voltooi -> klone -> wysig -> PR- werkvloei wat jy dikwels as 'n bydraer sal ervaar! | ||
|
|
||
| Vier jou bydrae en deel dit met jou vriende en volgelinge deur na die [webprogram te](https://roshanjossey.github.io/first-contributions/#social-share) gaan . | ||
|
|
||
| U kan by ons span aansluit indien u enige hulp nodig het of enige vrae het. [Sluit aan by 'n slapende span](https://join.slack.com/t/firstcontributors/shared_invite/enQtMzE1MTYwNzI3ODQ0LTZiMDA2OGI2NTYyNjM1MTFiNTc4YTRhZTg4OWZjMzA0ZWZmY2UxYzVkMzI1ZmVmOWI4ODdkZWQwNTM2NDVmNjY). | ||
|
|
||
| Kom ons begin met die bydrae tot ander projekte. Ons het 'n lys van projekte saamgestel met maklike probleme waarmee u kan begin. Kyk na [die lys van projekte in die web app](https://roshanjossey.github.io/first-contributions/#project-list). | ||
|
|
||
| ### [Bykomende materiaal](additional-material/git_workflow_scenarios/additional-material.md) | ||
|
|
||
| |<a href="github-desktop-tutorial.md"><img alt="GitHub Desktop" src="https://desktop.github.com/images/desktop-icon.svg" width="100"></a>|<a href="github-windows-vs2017-tutorial.md"><img alt="Visual Studio 2017" src="https://www.visualstudio.com/wp-content/uploads/2017/11/microsoft-visual-studio.svg" width="100"></a>|<a href="gitkraken-tutorial.md"><img alt="GitKraken" src="../assets/gk-icon.png" width="100"></a>|<a href="github-windows-vs-code-tutorial.md"><img alt="VS Code" src="https://upload.wikimedia.org/wikipedia/commons/2/2d/Visual_Studio_Code_1.18_icon.svg" width=100></a>| | ||
| |---|---|---|---| | ||
| |[GitHub Desktop](github-desktop-tutorial.md)|[Visuele Studio 2017](github-windows-vs2017-tutorial.md)|[GitKraken](gitkraken-tutorial.md)|[Visuele Studio Kode](github-windows-vs-code-tutorial.md)| | ||
|
|
||
| ## Self-bevordering | ||
|
|
||
| As jy van hierdie projek hou, sterf dit op [GitHub](https://github.com/Roshanjossey/first-contributions). | ||
| As jy veral liefdadigheid voel, volg [Roshan](https://roshanjossey.github.io/) op | ||
| [Twitter](https://twitter.com/sudo__bangbang) en | ||
| [GitHub](https://github.com/roshanjossey). | ||
|
|
||
| <a href="http://saasgrids.com"> <img alt="https://app.saasgrids.com" src="../assets/saasgrids-banner.png" width="500"></a> |
Oops, something went wrong.