https://github.com/ralucanicola/git

A repository to learn and practice git concepts
https://github.com/ralucanicola/git

Last synced: 25 days ago
JSON representation

A repository to learn and practice git concepts

• Host: GitHub
• URL: https://github.com/ralucanicola/git
• Owner: RalucaNicola
• Created: 2021-01-17T19:44:32.000Z (almost 4 years ago)
• Default Branch: master
• Last Pushed: 2021-01-17T23:03:14.000Z (almost 4 years ago)
• Last Synced: 2023-12-06T16:32:36.335Z (11 months ago)
• Language: Python
• Size: 3.91 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
This is a repository to practice git concepts

## Important concepts

**The different environments**

staging area/working directory/repository -> edit/stage/commit. Read about it [here](https://www.atlassian.com/git/tutorials/saving-changes).

![image git local remote](https://greenido.files.wordpress.com/2013/07/git-local-remote.png)

---

**Deal with merge conflicts** (learn together)

[Article to read about it](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts).

---

**Merge vs rebase**

When working on a branch, you'll need to regularly merge master in your branch to keep it up to date. There are two approaches to this: merging will create a new commit that merges the two branches together, while rebase will add all commits from master to your branch before the branch commits. Rebase creates a clean, linear history.

[Article about this](https://www.atlassian.com/git/tutorials/merging-vs-rebasing)

---

**How to collaborate in a team** (learn together)

 - [Gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) - develop features in branch and merge to main branch using a PR. Typical for internal projects at companies.

 - [Forking workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow) - fork a repo, develop feature in your own copy of the repo, open PR and merge to the initial repo. Typical for public open source projects because the maintainer can accept commits without giving the developer access to the official codebase.

---

 **Stashing**

 Sometimes you work on something and you need to change branch to check something else, but you're not ready to commit your changes. Stashing comes in handy here. Reading about [stashing here](https://www.atlassian.com/git/tutorials/saving-changes/git-stash).

 ---

## Cool resources

 http://git-school.github.io/visualizing-git/

 https://learngitbranching.js.org/