https://github.com/joechea-aupp/github_tut

Github 1️⃣0️⃣1️⃣
https://github.com/joechea-aupp/github_tut

git-branching git-clone git-fork git-merge

Last synced: about 2 months ago
JSON representation

Github 1️⃣0️⃣1️⃣

• Host: GitHub
• URL: https://github.com/joechea-aupp/github_tut
• Owner: joechea-aupp
• Created: 2023-07-27T14:45:06.000Z (almost 2 years ago)
• Default Branch: main
• Last Pushed: 2025-04-10T05:49:04.000Z (about 2 months ago)
• Last Synced: 2025-04-10T06:37:44.038Z (about 2 months ago)
• Topics: git-branching, git-clone, git-fork, git-merge
• Language: Python
• Homepage:
• Size: 1.71 MB
• Stars: 47
• Watchers: 1
• Forks: 102
• Open Issues: 18
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# GitHub 101

This guide will help you navigate GitHub with ease.




## Setting Up GitHub Desktop

1. Start by downloading and installing the [GitHub Desktop app](https://desktop.github.com/).

2. Sign in using your GitHub account.

3. Pick the repository you'd like to work on.

    ![Select Repository](resources/image_2023-07-27_22-06-51.png)

4. Choose a local folder where you'll store the project.

    ![Select Folder](resources/image_2023-07-27_22-06-54.png)

5. Click 'Clone' to download the project to your local folder.




## Making Changes and Committing

1. Make any changes you want to the project.

2. Open the GitHub Desktop app to see the changes you've made.

    ![Observe Changes](resources/image_2023-07-27_22-21-52.png)

3. To save your changes or commit the history, go to the bottom left of the screen, give your change history a title, and click on `commit to main`.

    ![Commit Changes](resources/image_2023-07-27_22-29-22.png)

4. Once you've committed, your changed file will no longer appear in the left menu.

5. Click `Push origin` to upload your changes to GitHub.

    ![Push Changes](resources/image_2023-07-27_22-30-59.png)




## Creating Repositories on GitHub

1. Sign in to your GitHub account on your preferred web browser.

    ![Login](resources/1.png)

2. Click on the `+` button at the top right of the screen and select `New repository`.

    ![New Repository](resources/2.5.png)

3. Give your repository a name and, if you want, add a description.

    ![Name Repository](resources/4.png)

4. Make sure the repository is set to `Public`.

    ![Set Public](resources/5.png)

5. Click on `add a README file` and then `Create repository`.

    ![Create Repository](resources/6.png)




## Changing Repository Remote Origin

1. Copy the URL of the new repository you want to switch to.

    ![Copy URL](resources/8.png)

2. Open the repository you want to change from in VS Code and open the terminal.

    ![Open Terminal](resources/9.png)

3. Type `git remote set-url origin ` and press enter.

    ![Set URL](resources/10.png)

4. Add, commit, and push the changes to the new repository using the VS Code UI.

    ![Push Changes](resources/11.png)




## Understanding Git in VS Code

- Green vertical lines next to line numbers show incoming updates to the repository.

    ![Incoming Changes](resources/image_2023-07-27_22-35-04.png)

- Blue vertical lines next to line numbers show outgoing updates to the repository. Click on the blue line to see the changes you've made.

    ![Outgoing Changes](resources/image_2023-07-27_23-09-10.png)




## Using GitHub Desktop

- Green = data **added** to the repository

- Red = data **deleted** from the repository

- Orange = **modified data** in the repository

    ![Color Indicators](resources/image_2023-07-27_23-18-22.png)




## Understanding History, Reverting Changes, and Resolving Conflicts

1. In GitHub Desktop, you'll see the history tab to the right of the `Changes` tab. Click on it to see the repository's history.

    ![History](resources/image_2023-07-27_23-25-48.png)

2. To undo changes, right-click on any history you want to revert and click on `Revert changes in commit`.

    ![Revert Changes](resources/image_2023-07-27_23-32-01.png)

3. If your changes affect or are about to overwrite the current content in your project, a prompt to resolve conflicts will appear.

    ![Conflict Prompt](resources/image_2023-07-28_08-26-24.png)

4. Switch to VS Code to resolve the conflict. Files marked as conflicted will have `>>>>>>` and `<<<<<<` in the file and will be colored in red or orange.

    ![Conflict Markers](resources/image_2023-07-28_08-26-31.png)

5. Click on the conflicted file and click on `Resolve in Merge Editor`. The incoming changes will be on the left side and the outgoing changes will be on the right side.

    ![Resolve Conflict](resources/image_2023-07-28_08-29-11.png)

6. Click `Accept Incoming Change` to accept the incoming changes, `Accept Current Change` to accept the outgoing changes, or `Accept Both Changes` to accept both.

7. Click `Complete Merge` to finish the merge.

    ![Complete Merge](resources/image_2023-07-28_08-33-51.png)




## Branching

Branching lets you work on different versions of a repository at the same time. By default, your repository has one branch named `main`, which is considered the definitive branch. We use branches to experiment and make edits before committing them to `main`.

1. To create a new branch, click on the `Current Branch` button at the top left of the screen and click on `New Branch`.

    ![New Branch](resources/image_2023-07-28_08-47-02.png)

2. Give your branch a name and click `Create Branch`.

    ![Name Branch](resources/image_2023-07-28_08-48-14.png)

3. Any changes you make on the new branch won't affect the `main` branch.

4. To merge the branch into the `main` branch, click on the `Current Branch` button at the top left of the screen and click on the `main` branch.

    ![Select Main](resources/image_2023-07-28_08-54-17.png)

5. Click on `Choose a branch to merge into main`.

    ![Choose Branch](resources/image_2023-07-28_08-55-17.png)

6. Click on the branch you want to merge and click `Create a merge commit`.




## Resources

### VS Code Extensions for GitHub

- [GitHub Pull Requests and Issues](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github)

- [GitLens](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)

### YouTube Tutorials

- [GitHub Desktop Tutorial](https://www.youtube.com/watch?v=8Dd7KRpKeaE)

- [Git and GitHub Crash Course](https://www.youtube.com/watch?v=tRZGeaHPoaw)

### Additional Sources

- [GitHub Learning Lab](https://github.com/apps/github-learning-lab)

- [GitHub Docs](https://docs.github.com/en)