https://github.com/phien-ntace/how_to_use_git
https://github.com/phien-ntace/how_to_use_git
git
Last synced: 3 days ago
JSON representation
- Host: GitHub
- URL: https://github.com/phien-ntace/how_to_use_git
- Owner: phien-ntace
- Created: 2019-06-04T11:26:38.000Z (about 7 years ago)
- Default Branch: master
- Last Pushed: 2025-07-15T15:15:28.000Z (about 1 year ago)
- Last Synced: 2025-07-16T09:37:33.180Z (about 1 year ago)
- Topics: git
- Language: C
- Homepage:
- Size: 14.6 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# 1/ Initial information
#### git config --global user.name "xxx xxx"
#### git config --global user.email "xxx@gmail.com"
# 2/ Check information
#### git config --list
# 3/ Create local repository
#### git init code_folder_git
# 4/ Copy current project to code_folder_git
# 5/ Add code and commit
#### git add .
#### git commit -m "First Commit"
# 6/ Create repository in github
# 7/ Push to server
#### git remote add origin https://github.com/phien-ntace/how_to_use_git.git
#### git push -u origin main`* (origin: default name of repository on your PC)
# 8/ Update code (safe team workflow)
### Step 1: Always update your local code before pushing
#### git pull --rebase origin main
### Step 2: Add, commit and push normally
#### git add .
#### git commit -m "Your changes"
#### git push origin main
#### If conflict happens during pull (both modified same file/line):
- Git will show CONFLICT and stop.
- You must open the file and resolve the conflict manually.
- After resolving:
#### git add
#### git rebase --continue
#### git push origin main
# 9/ Delete a file
#### git rm $file_name
#### git push origin main
# 10/ Get log and status
#### git log
#### git status
# 11/ Branch
#### Check current branch: git branch
#### Switch to branch name: git checkout branch_name
#### Create branch: git branch branch_name
#### Push branch first time: git push --set-upstream branch_name
#### Merge branch to main: git checkout main + git merge branch_name
# 12/ Resolve conflict to pull
- Method 1: Commit changed file and pull
#### git add file_name
#### git commit -m "..."
#### git pull origin main
- Method 2: Use stash to store changes
- If you don't want to commit yet and just want to temporarily save the changes before pulling.
- If stash pop causes a conflict, Git will ask you to resolve it like a regular merge.
#### git stash
#### git pull origin main
#### git stash pop
- Method 3: Discard changes (do not keep edited file)
- If you don't need the current .vscode/settings.json and want to overwrite it with the latest version from GitHub:
#### git checkout -- file_name
#### git pull origin main