Learn GIT Version Control

[asolowiej94]

• [ ] overall git usage experience
• [x] branching strategies, awareness of them
• [ ] resolving merge conflicts
• [ ] Knowledge of Version control software - common clients, what is the advantage of using them, awareness of it

[asolowiej94]

@Seithar2017

• What is the difference between Git and GitHub? 🤡
• Step by step (in a way that you’d be able to explain it to me), how to correctly (make a list of commands in order):
  • Authorize yourself on GitHub and download any repository
  • Start working, meaning: create a branch, make changes, save, and commit
  • What to do next, meaning making a pull request/merge request (gather information about the difference between the two and why it doesn’t really matter much 😄
• Find information about GitFlow: what it is, how to start using it, and its main features
• Find information about trunk-based development: what it is, how to start using it, and its main features
• Compare them with each other, preferably in a table format
• Think about and answer the question: Which of these two methods would you use to manage your repository? Why? When would you do it differently?

In general, to move forward with the development topic, you need to know Git perfectly so that we don’t waste time on it. It’s something you’ll always be using and constantly improving, but you need to master the basics. To complete this task, you can use anything—from chat, to YouTube, to tutorial videos—but you need to know and understand what it is, so I emphasize: you should be able to explain it.

[Seithar2017]

git flow vs trunk.xlsx

What is the difference between Git and GitHub? 🤡

Git is a version control system - it works locally so it means most of the tools such as branching, merging, commiting and so on can be done offline.

Github is a hosting platform where you can store your repos in cloud. Github helps to maintain projects, share code, make pull request, raise issues etc.

Step by step (in a way that you’d be able to explain it to me), how to correctly (make a list of commands in order):

• Authorize yourself on GitHub and download any repository:

  • Go to GitHub -> Developer Settings -> Personal access tokens -> Tokens(classic)
  • in console type
  • • git config --global user.name "MyUserName"
  • • git config --global user.email "MyEmail@example.com"
  • copy URL of repository from github, and type in console:
  • • git clone https://github.com/username/repositoryname.git

Start working, meaning:

• create a branch

• • Make sure you are in your repository folder, e.g cd repository-name

• • git checkout -b new-branch

• • checkout -b means creating and switching to the new-branch

• make changes,

• • adding changes: git add .

• save, commit:

• • git commit -m "commit comment"

• push:

• • git push origin feature-branch

• • origin just points at the repo that was cloned and that git currently points at.

What to do next, meaning making a pull request/merge request (gather information about the difference between the two and why it doesn’t really matter much 😄

Pull request and merge request is pretty much the same but used on different platform, that is Pull request is for GitHub and Merge request is for GitLab

Find information about GitFlow: what it is, how to start using it, and its main features

https://www.youtube.com/watch?v=1SXpE08hvGs https://www.youtube.com/watch?v=N542A8DKoaI

Comparison as table attached