Skip to content
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.

Sign up for GitHub

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

Adding drop downs #2537

Closed
wants to merge 8 commits into from
Closed

Adding drop downs #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a08f342
Add files via upload
hemu-codes Jun 29, 2019
894eb64
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
5f5a2f6
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
0f3b9d7
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
2b12b7b
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
e51d66a
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
22d8b9e
Update vi-github-and-repositories.md
hemu-codes Jul 12, 2019
7f3be12
Update vi-github-and-repositories.md
hemu-codes Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added pages/vi/images/vi-Step6-screenshot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion pages/vi/vi-github-and-repositories.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,28 @@ This is just a summary of the steps that you will need to perform. Please, keep

**NOTE**: You will see some common names used in git (*which you can change*), such as `master: the name of the main branch`, `upstream: the location where you forked the repository from`, and `origin: the location you cloned repository from`. Both `upstream and origin` are considered **remote**. Keep in mind also, a repository may contain many branches.

### Clone Your GitHub Repository username.github.io

<details open> <summary> Clone Your Github Repository username.github.io </summary>

### Clone Your Github Repository username.github.io

Now, we will be using GitHub repositories on a command line, which means that there is a separate step to get your GitHub repository on your OS. To be clear, you will be using both the command line and the GitHub user interface, meaning that you need to constantly be checking to make sure that your version is not behind to avoid merge conflicts. Therefore, open a command line and open your username.github.io repository on the GitHub user interface. You then need to copy the link provided in the repository (see the picture below).

![GitHub Clone URL](images/vi-github-clone-url.png)

Then, turn to your command prompt and type your repository URL in the form of `git clone https://github.com/EmilyLarkin/EmilyLarkin.github.io.git` into the command line. Be sure to use the correct URL to clone your repository (you will obviously type your own username). If you `cd ` into your `<username>.github.io` you can see different files which you will be working on during your internship.
</details>

<details open> <summary> Clone with HTTPS or Clone with SSH? </summary>

### Clone with HTTPS or Clone with SSH?

Both HTTPS and SSH URLs identify the same remote repositories but use different protocols to access the codebase. Besides HTTPS, which we talked about above, you can also use SSH to do the same thing. You can explore the differences using [HTTPS or SSH for cloning](https://help.github.com/articles/which-remote-url-should-i-use/).

</details>

<details open> <summary> Explanation About Repositories and Syncing Process </summary>

### Explanation About Repositories and Syncing Process

The previous step created a clone of your repository on your OS.
Expand All @@ -48,7 +58,10 @@ Now, there are three different Github repository levels: [open-learning-exchange
As you create a fork from the original repository and then clone your forked repository onto your OS, you will need to frequently update the fork so that your fork and clone are not behind. Further, you need to sync your repository on your OS and on GitHub (username.github.io) with the upstream repository (open-learning-exchange.github.io). There are various ways to do this, as explained below.

First, the [GitHub help section](https://help.github.com/en) and the [Git website](https://git-scm.com) are incredibly helpful in answering your basic questions. For example, [this link](https://help.github.com/articles/syncing-a-fork/) explains how to sync a fork with the correct upstream repo, because as you renamed your repository, it does not automatically assume that open-learning-exchange.github.io is the source. Instead, it assumes that username.github.io is the master which fails to allow a proper syncing process. Therefore, when you do `git diff` and `git status`, it only looks at your username.github.io. Thus, following the steps below, you will need to use `git fetch upstream`, `git checkout master`, and `git merge upstream/master` to correctly sync to open-learning-exchange.github.io.
</details>

<details open> <summary> Configure a Remote Repository for Your Fork </summary>

### Configure a Remote Repository for Your Fork

To be able to fetch updates from the upstream repository, you need to first configure the upstream repository by following these steps:
Expand All @@ -75,7 +88,10 @@ origin https://github.com/YOUR_USERNAME/YOUR_USERNAME.github.io.git (push)
upstream https://github.com/open-learning-exchange/open-learning-exchange.github.io.git (fetch)
upstream https://github.com/open-learning-exchange/open-learning-exchange.github.io.git (push)
```
</details>

<details open> <summary> Sync Your Fork </summary>

### Sync Your Fork

Then, use the command `git fetch upstream` to fetch branches from the upstream repository (in this case, it is open-learning-exchange.github.io). Next, check your fork's master branch with `git checkout master`. You should see some variation of this response:
Expand Down Expand Up @@ -144,6 +160,8 @@ index bf400c0..fc7380b 100644

This process needs to be repeated whenever you begin to work, to make sure that you are always up to date. If there are discrepancies, it will mess up the code and you could potentially lose your saved changes, because it was not updated properly. We will provide more information on editing and saving changes in the next tutorial.

</details>

## Summary of Steps

Generally, follow these commands in your command line, but refer back above if there are any errors or further questions about why you are writing any of the following commands
Expand Down