Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • F first-contributions
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 322
    • Merge requests 322
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • First Contributions
  • first-contributions
  • Merge requests
  • !11960

Add Natalie Gilmore to Contributors list

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Administrator requested to merge github/fork/ngil7/add-ngil7 into master 6 years ago
  • Overview 0
  • Commits 25908
  • Pipelines 0
  • Changes 176

Created by: ngil7

Compare
  • master (base)

and
  • latest version
    1c0f9f09
    25908 commits, 2 years ago

176 files
+ 2377
- 0

    Preferences

    File browser
    Compare changes
.gi‎thub‎
CONTRIB‎UTING.md‎ +51 -0
ISSUE_TE‎MPLATE.md‎ +20 -0
additiona‎l-material‎
git_workflo‎w_scenarios‎
Useful-links-for-f‎urther-learning.md‎ +32 -0
additional-‎material.md‎ +46 -0
amending-a‎-commit.md‎ +48 -0
configuri‎ng-git.md‎ +76 -0
keeping-your-fork-synced‎-with-this-repository.md‎ +40 -0
moving-a-commit-to-a‎-different-branch.md‎ +25 -0
removing-‎a-file.md‎ +23 -0
removing-branch-fro‎m-your-repository.md‎ +31 -0
resolving-merg‎e-conflicts.md‎ +35 -0
reverting-‎a-commit.md‎ +41 -0
squashing-‎commits.md‎ +86 -0
stashing-‎a-file.md‎ +138 -0
undoing-a‎-commit.md‎ +55 -0
transl‎ations‎
additional-m‎aterial.id.md‎ +46 -0
additional-m‎aterial.ko.md‎ +42 -0
additional-mat‎erial.pt_br.md‎ +46 -0
additional-m‎aterial.ru.md‎ +47 -0
additional-m‎aterial.sl.md‎ +46 -0
additional-m‎aterial.ur.md‎ +47 -0
addtional-ma‎terial.cht.md‎ +46 -0
amending-a-‎commit.ko.md‎ +46 -0
amending-a-co‎mmit.pt_br.md‎ +52 -0
amending-a-‎commit.ru.md‎ +45 -0
amending-a-‎commit.sl.md‎ +48 -0
amending-a-‎commit.ur.md‎ +52 -0
configurin‎g-git.ru.md‎ +77 -0
configurin‎g-git.sl.md‎ +77 -0
keeping-your-fork-synced-‎with-this-repository.ko.md‎ +41 -0
keeping-your-fork-synced-wi‎th-this-repository.pt_br.md‎ +40 -0
keeping-your-fork-synced-‎with-this-repository.sl.md‎ +40 -0
moving-a-commit-to-a-‎different-branch.hi.md‎ +26 -0
moving-a-commit-to-a-‎different-branch.ko.md‎ +28 -0
moving-a-commit-to-a-‎different-branch.ru.md‎ +25 -0
moving-a-commit-to-a-‎different-branch.sl.md‎ +25 -0
removing-a‎-file.ru.md‎ +23 -0
removing-a‎-file.sl.md‎ +23 -0
removing-a‎-file.ua.md‎ +23 -0
removing-branch-from-‎your-repository.hi.md‎ +32 -0
removing-branch-from-‎your-repository.ko.md‎ +30 -0
removing-branch-from-y‎our-repository.pt_br.md‎ +31 -0
removing-branch-from-‎your-repository.sl.md‎ +30 -0
resolving-merge‎-conflicts.ko.md‎ +43 -0
resolving-merge‎-conflicts.sl.md‎ +34 -0
reverting-a-‎commit.ko.md‎ +35 -0
reverting-a-‎commit.sl.md‎ +39 -0
squashing-c‎ommits.sl.md‎ +94 -0
stashing-a‎-file.sl.md‎ +137 -0
undoing-a-c‎ommit.ko.md‎ +59 -0
undoing-a-c‎ommit.sl.md‎ +55 -0
ass‎ets‎
catala‎n1.png‎ +0 -0
clon‎e.png‎ +0 -0
compare-an‎d-pull.png‎ +0 -0
copy-to-cl‎ipboard.png‎ +0 -0
dt-bran‎ch1.png‎ +0 -0
dt-bran‎ch2.png‎ +0 -0
dt-bran‎ch3.png‎ +0 -0
dt-clo‎ne1.png‎ +0 -0
dt-clo‎ne2.png‎ +0 -0
dt-clo‎ne3.png‎ +0 -0
dt-clo‎ne4.png‎ +0 -0
dt-comm‎it1.png‎ +0 -0
dt-comm‎it2.png‎ +0 -0
dt-publ‎ish1.png‎ +0 -0
dt-publ‎ish2.png‎ +0 -0
dt-sta‎tus.png‎ +0 -0
dt-sy‎nc.png‎ +0 -0
dt-syn‎c2.png‎ +0 -0
dt-syn‎c3.png‎ +0 -0
dt1-cloneto‎desktop.png‎ +0 -0
dt1-com‎mit1.png‎ +0 -0
dt1-com‎mit2.png‎ +0 -0
dt1-create-br‎anch-name.png‎ +0 -0
dt1-create‎-branch.png‎ +0 -0
dt1-downl‎oaded.png‎ +0 -0
dt1-open-gith‎ubdesktop.png‎ +0 -0
dt1-publ‎ish1.png‎ +0 -0
dt1-sig‎n-in.png‎ +0 -0
dt1-sta‎tus.png‎ +0 -0
fork‎.png‎ +0 -0
git-sta‎tus.png‎ +0 -0
gk-bra‎nch.png‎ +0 -0
gk-clo‎ne.png‎ +0 -0
gk-com‎mit.png‎ +0 -0
gk-ed‎it.png‎ +0 -0
gk-ic‎on.png‎ +0 -0
gk-log‎in.png‎ +0 -0
gk-ori‎gin.png‎ +0 -0
gk-pu‎sh.png‎ +0 -0
gk-sta‎ge.png‎ +0 -0
join-slac‎k-team.png‎ +0 -0
pirat‎e.png‎ +0 -0
saasgrids-‎banner.png‎ +0 -0
submit-pull‎-request.png‎ +0 -0
triangle_w‎orkflow.png‎ +0 -0
triangle_work‎flow.pt_br.png‎ +0 -0
vs2017-01-‎clone1.png‎ +0 -0
vs2017-02-‎clone2.png‎ +0 -0
vs2017-03-‎clone3.png‎ +0 -0
vs2017-04-‎branch1.png‎ +0 -0
vs2017-05-‎branch2.png‎ +0 -0
vs2017-06-‎branch3.png‎ +0 -0
vs2017-07-‎branch4.png‎ +0 -0
vs2017-08-‎change1.png‎ +0 -0
vs2017-09-‎commit1.png‎ +0 -0
vs2017-10-‎commit2.png‎ +0 -0
vs2017-11-‎commit3.png‎ +0 -0
vs2017-12-‎commit4.png‎ +0 -0
vs2017-13-‎commit5.png‎ +0 -0
vs2017-14-‎commit6.png‎ +0 -0
vscode-2018-‎08-branch.png‎ +0 -0
vscode-2018-0‎8-changes.png‎ +0 -0
vscode-2018-‎08-clone.png‎ +0 -0
vscode-2018-‎08-clone1.png‎ +0 -0
vscode-2018-‎08-clone2.png‎ +0 -0
vscode-2018-‎08-clone3.png‎ +0 -0
vscode-2018-‎08-commit.png‎ +0 -0
vscode-2018-0‎8-commit1.png‎ +0 -0
vscode-2018-0‎8-gh-auth.png‎ +0 -0
vscode-2018‎-08-push.png‎ +0 -0
transl‎ations‎
README‎.ar.md‎ +0 -0
README‎.bg.md‎ +0 -0
README‎.bn.md‎ +0 -0
README‎.ca.md‎ +0 -0
README‎.chs.md‎ +0 -0
README‎.cht.md‎ +0 -0
README‎.cs.md‎ +0 -0
README‎.da.md‎ +0 -0
README‎.de.md‎ +0 -0
README‎.eg.md‎ +0 -0
README.en‎-pirate.md‎ +0 -0
README‎.es.md‎ +0 -0
README.‎fa.en.md‎ +0 -0
README‎.fa.md‎ +0 -0
README‎.fr.md‎ +0 -0
README‎.gl.md‎ +0 -0
README‎.gr.md‎ +0 -0
README‎.hb.md‎ +0 -0
README‎.hi.md‎ +0 -0
README‎.id.md‎ +0 -0
README‎.it.md‎ +0 -0
README‎.ja.md‎ +0 -0
README‎.ko.md‎ +0 -0
README‎.lt.md‎ +0 -0
README.mm_‎unicode.md‎ +0 -0
README‎.mr.md‎ +0 -0
README‎.mx.md‎ +0 -0
README‎.nl.md‎ +0 -0
README‎.np.md‎ +0 -0
README‎.pl.md‎ +0 -0
README.‎pt-pt.md‎ +0 -0
README.‎pt_br.md‎ +0 -0
README‎.ro.md‎ +0 -0
README‎.ru.md‎ +0 -0
README‎.se.md‎ +0 -0
README‎.sl.md‎ +0 -0
README‎.slk.md‎ +0 -0
README‎.te.md‎ +0 -0
README‎.th.md‎ +0 -0
README‎.tr.md‎ +0 -0
README‎.ua.md‎ +0 -0
README‎.ur.md‎ +0 -0
README‎.vn.md‎ +0 -0
Transla‎tions.md‎ +0 -0
.giti‎gnore‎ +0 -0
CODE_OF_C‎ONDUCT.md‎ +0 -0
Contrib‎utors.md‎ +0 -0
LIC‎ENSE‎ +0 -0
READ‎ME.md‎ +0 -0
github-desktop-old-‎version-tutorial.md‎ +0 -0
github-deskto‎p-tutorial.md‎ +0 -0
github-windows-vs‎-code-tutorial.md‎ +0 -0
github-windows-v‎s2017-tutorial.md‎ +0 -0
gitkraken-‎tutorial.md‎ +0 -0
package-‎lock.json‎ +0 -0
.github/CONTRIBUTING.md 0 → 100644
+ 51
- 0
  • View file @ 1c0f9f09

# Contribution guide
Welcome to your first contribution. :heart:
#### Before Contributing:
You need to run it locally on your desktop.
In order to do that, move to the desired location where package.json file is located
- Install npm(latest version) -
npm is distributed with Node.js - which means that when you download Node.js,
you automatically get npm installed on your computer.
https://www.npmjs.com/get-npm
- Install all the dependencies used by this project.
Use this command: `install npm`
- Run these final commands to run it locally:
`npm install`
`npm run build`
`npm start`
### Table Of Contents
- [Code of Conduct](#code-of-conduct)
- [Translation Guide](#translation-guide)
## Code of Conduct
If you want to contribute, you need to know a few things.
[Code of conduct](../CODE_OF_CONDUCT.md)
## Translation Guide
We have some rules for translation. If you make the first translation for your language, you must add your language list on `Translations.md`.
### Example
`Translations.md`
```markdown
|Country | Translated Link |
| --- | --- |
| English | [English](../README.md) |
| 🇮🇳 India | [Hindi](../translations/README.hi.md) |
| 🇲🇲 Myanmar | [Myanmar Unicode](../translations/README.mm_unicode.md), Myanmar ZawGyi |
```
## TODO
- [ ] Fix the grammar for the contribution guide.
- [ ] Add more examples and more guides.
Thanks! :heart:
.github/ISSUE_TEMPLATE.md 0 → 100644
+ 20
- 0
  • View file @ 1c0f9f09

<!--- Provide a general summary of the issue in the Title above -->
🐞 **Problem**
<!--- Provide a detailed description of the change or addition you are proposing -->
<!--- If it is a feature or a bug, what problem is it solving-->
🎯 **Goal**
<!--- Why is this change important to you? How would you use it? -->
<!--- How can it benefit other users? -->
💡 **Possible solutions**
<!--- Not obligatory, but suggest an idea for implementing addition or change -->
📋 **Steps to solve the problem**
* Comment below about what you've started working on.
* Add, commit, push your changes.
* Submit a pull request and add this in comments - `Addresses #<put issue number here>`
* Ask for a review in comments section of pull request.
* Celebrate your contribution to this project. 🎉
additional-material/git_workflow_scenarios/Useful-links-for-further-learning.md 0 → 100644
+ 32
- 0
  • View file @ 1c0f9f09

# Useful Links
This document is dedicated to all the tips and tricks websites, blog posts, and helpful sites that make our lives easier. They are a great reference to serve all of our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more.
## The List
1. [Interactive tutorial to git](https://try.github.io)
2. [git - the simple guide](http://rogerdudler.github.io/git-guide/)
3. [On undoing, fixing, or removing commits in git](http://sethrobertson.github.io/GitFixUm/fixup.html)
4. [Git and GitHub tutorial translated to many languages](https://github.com/Roshanjossey/first-contributions)
5. [Merge Conflicts](https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/merge-conflicts)
6. [Resolving Merge Conflicts](https://githowto.com/resolving_conflicts)
7. [Basics of Git - The Simple Quick Start Guide](https://blog.praveen.science/basics-of-git-the-quick-start-guide/)
8. [Git Standards followed in our way of Spotify Agile Methodology](https://blog.praveen.science/git-standards-followed-in-our-way-of-spotify-agile-methodolgy/)
9. [Git Shortcuts](https://blog.praveen.science/git-shortcuts/)
10. [Official Git cheat sheet in many languages](https://services.github.com/on-demand/resources/cheatsheets)
11. [Git cheat sheet from Tower](https://www.git-tower.com/learn/cheat-sheets/git)
12. [Common Git Problems](https://www.codementor.io/citizen428/git-tutorial-10-common-git-problems-and-how-to-fix-them-aajv0katd)
13. [Git Rebase](https://blog.gitprime.com/git-rebase-an-illustrated-guide/)
14. [Beginner's Guide to Rebasing and Squashing](https://github.com/servo/servo/wiki/Beginner%27s-guide-to-rebasing-and-squashing)
15. [Git Cheatsheet that shows correlations between commands and files](http://ndpsoftware.com/git-cheatsheet.html)
16. [How to contribute](https://opensource.guide/how-to-contribute/)
17. [Getting started with Open Source](https://github.com/OpenSourceHelpCommunity/Getting-Started-With-Contributing-to-Open-Sources)
18. [How to contribute](https://github.com/freeCodeCamp/how-to-contribute-to-open-source)
19. [Atlassians Git Tutorials](https://www.atlassian.com/git)
20. [Pull request reviews](https://help.github.com/articles/about-pull-request-reviews/)
21. [Another Interactive tutorial for git](https://learngitbranching.js.org/)
22. [Git commandline cheat-sheet](https://gist.github.com/davfre/8313299)
23. [Programming Books](https://github.com/EbookFoundation/free-programming-books)
24. [E-Book of professional tip and secrets](https://goalkicker.com/GitBook/GitProfessionalTipsSecrets.pdf)
25. [tutorial about simple rules of become git professional](https://medium.freecodecamp.org/follow-these-simple-rules-and-youll-become-a-git-and-github-master-e1045057468f)
Keep adding more links, that you find helpful.
additional-material/git_workflow_scenarios/additional-material.md 0 → 100644
+ 46
- 0
  • View file @ 1c0f9f09

# Additional information
We assume that you have already finished with the basic tutorial before coming here. This document will give you some additional information about advanced Git techniques.
### [Amending a commit](amending-a-commit.md)
This document provides information about how to amend a commit on the remote repository.
> Use this when you need to adjust a commit you made.
### [Configuring git](configuring-git.md)
This document provides information about how to configure user details and other options in git.
> Use this to better control your git configurations.
### [Keeping your fork synced with the repository](keeping-your-fork-synced-with-this-repository.md)
This document provides information about how to keep your forked repository up-to-date with the base repository. This is important, as hopefully you and many others will contribute to the project.
> Follow these steps if your fork doesn't have any changes in parent repository.
### [Moving a Commit to a different Branch](moving-a-commit-to-a-different-branch.md)
This document provides information about how to move a Commit to another Branch.
> Take these steps to move a commit to another branch.
### [Removing a File](removing-a-file.md)
This document provides information about how to remove a file from your local repository.
> Follow these steps to learn how to remove a file prior to a commit
### [Removing a branch from your repository](removing-branch-from-your-repository.md)
This document provides information about how to delete a branch from your repository.
> Only do these steps after your pull request get's merged.
### [Resolving Merge Conflicts](resolving-merge-conflicts.md)
This document provides information about how to resolve merge conflicts.
> Take these steps to resolve the annoying merge conflicts.
### [Reverting a commit](reverting-a-commit.md)
This document provides information about how to revert a commit on the remote repository. It will come in handy in case you need to undo a commit that has already been pushed to Github.
> Take these steps if you want to reverse a commit.
### [Squashing Commits](squashing-commits.md)
This document provides information about how to squash commits with an interactive rebase.
> Use this if you want to open a PR in an open source project and the reviewer asks you to squash every commit into one, with an informative commit message.
### [Undo-ing a local commit](undoing-a-commit.md)
This document provides information about how to undo a commit on your local repository. This is what you need to do when you feel you've messed up your local repository and wish to reset the local repository.
> Take these steps if you want to undo/reset a local commit.
### [Useful Links](Useful-links-for-further-learning.md)
This document is dedicated to all the tips and tricks websites, blog posts, and helpful sites that make our lives easier. They are a great reference to serve all of our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more.
additional-material/git_workflow_scenarios/amending-a-commit.md 0 → 100644
+ 48
- 0
  • View file @ 1c0f9f09

# Amending a Commit
What if you commit a change to your remote repository only to realize later that you have a typo in the commit message or you forgot to add a line in your most recent commit.
How do you edit that? This is what this tutorial covers.
## Changing a recent commit message after you have pushed to Github.
To do this without opening a file:
* Type in the ```git commit --amend -m "followed by your new commit message"```
* Run ```git push origin <branch-name>``` to commit the changes to the repository.
Note: If you type in just ```git commit --amend```, your text editor would open up prompting you to edit the commit message.
Adding the ``-m`` flags prevents it.
## Modifying on a single commit
So, what if we forgot to make a minor change to a file like changing a single word and we have already pushed the commit to our remote repository?
To illustrate here is a log of my commits:
```
g56123f create file bot file
a2235d updated contributor.md
a5da0d modified bot file
```
Let's say I forgot to add a single word to the bot file
There are 2 ways to go about this. The first is to have an entirely new commit that contains the change like so:
```
g56123f create file botfile
a2235d updated contributor.md
a5da0d modified botfile
b0ca8f added single word to botfile
```
The second way is to amend the a5da0d commit, add this new word and push it to Github as one commit.
The second sounds better since it is just a minor change.
To achieve this, we would do the following:
* Modify the file. In this case, I will modify the botfile to include the word I omitted previously.
* Next, add the file to the staging area with ```git add <filename>```
Usually after adding files to the staging area, the next thing we do is git commit -m "our commit message" right?
But since what we want to achieve here is to amend the previous commit, we would instead run:
* ```git commit --amend```
This would then bring up the text editor and prompt you to edit the message. You can decide to leave the message as it was before or change it.
* Exit the editor
* Push your changes with `` `git push origin <branch-name>` ``
That way, both changes would be in one single commit.
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference: CellularPrivacy/Android-IMSI-Catcher-Detector!122
Source branch: github/fork/ngil7/add-ngil7

Menu

Explore Projects Groups Snippets