https://github.com/chaudinh/git-from-zero-to-hero

My practice for a git course
https://github.com/chaudinh/git-from-zero-to-hero

Last synced: about 1 month ago
JSON representation

My practice for a git course

• Host: GitHub
• URL: https://github.com/chaudinh/git-from-zero-to-hero
• Owner: ChauDinh
• Created: 2019-10-04T10:33:25.000Z (over 5 years ago)
• Default Branch: chalk
• Last Pushed: 2019-10-04T13:36:59.000Z (over 5 years ago)
• Last Synced: 2024-11-18T13:39:14.737Z (3 months ago)
• Language: JavaScript
• Size: 6.84 KB
• Stars: 1
• Watchers: 2
• Forks: 0
• Open Issues: 1
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# Git course

This repo is my practice for the course "git frome zero to hero" of codersx.

## What we will cover?

- Installation

- commits

- git log/ git show/ git diff

- working dir, staging area, git repository

- checkout, reset

- branching, merging

- git reset

- git revert

- .gitignore file

- github, bitbucket, gitlab

- git clone, git pull

- push a branch

- pull request

- code review

- resolve conflict with git rebase

- resolve conflict with merge

## Work with a team

- git checkout -b 

- git push origin 

- create a pull request on Github

- review code

  -- review code online (github)

  -- fetch branch into local machine to test offline

  -- approve the pull request

- merge to master

## Resolve conflicts

When will conflicts happen?

- Changing the same file + same line

- A deleted file X, B modified file X

How to resolve?

### Method 1:

- Using `git rebase`

- Resolve conflict

- Push again with -f

### Method 2:

- Merge updated master to feature branch

- Resolve conflict

- Commit and push