Git: دليل تفصيلي لعمليات السحب في Git والتحديثات عن بُعد

# Pull updates from the current branch
git pull

# Output：
# remote: Enumerating objects: 5, done.
# remote: Counting objects: 100% (5/5), done.
# remote: Compressing objects: 100% (3/3), done.
# remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
# Unpacking objects: 100% (3/3), 285 bytes | 285.00 KiB/s, done.
# From https://github.com/user/repo
#    a1b2c3d..d4e5f6g  main        -> origin/main
# Updating a1b2c3d..d4e5f6g
# Fast-forward
#  file.js | 1 +
#  1 file changed, 1 insertion(+)

# Pull a specified remote branch
git pull origin main

# Pull a remote branch into a local branch with a different name
git pull origin remote-branch:local-branch

# Pull updates from all remote branches
git pull --all

# Pull and view details
git pull --verbose

# View differences between local and remote versions
git fetch
git diff main origin/main

# View new commits on the remote repository
git log main..origin/main

# Output：
# d4e5f6g (origin/main) feat: Add a New Feature
# h7i8j9k fix: FixBug

# View the files to be pulled
git diff --name-only main origin/main

# Output：
# src/auth.js
# src/user.js

# Confirm before pulling
git pull

# Use by defaultmergePull
git pull

# Equivalent to
git fetch
git merge origin/main

# A merge commit will be created after the pull.（If there is a fork）
git log --oneline --graph

# Output：
# *   a1b2c3d Merge branch 'main' of https://github.com/user/repo
# |\
# | * d4e5f6g (origin/main) Remote commit
# * | h7i8j9k Local commit
# |/
# * k9l0m1n Base commit

# UsagerebasePull
git pull --rebase

# Output：
# remote: Enumerating objects: 5, done.
# From https://github.com/user/repo
#    a1b2c3d..d4e5f6g  main        -> origin/main
# First, rewinding head to replay your work on top of it...
# Fast-forwarded main to d4e5f6g.

# View History（Linear，No merged commits）
git log --oneline --graph

# Output：
# * h7i8j9k Local commit
# * d4e5f6g (origin/main) Remote commit
# * k9l0m1n Base commit

# The same file was modified both locally and remotely
git pull

# Output：
# remote: Enumerating objects: 5, done.
# From https://github.com/user/repo
#    a1b2c3d..d4e5f6g  main        -> origin/main
# Auto-merging file.js
# CONFLICT (content): Merge conflict in file.js
# Automatic merge failed; fix conflicts and then commit the result.

# View Conflict Status
git status

# Output：
# You have unmerged paths.
#   (fix conflicts and run "git commit")
# 
# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#   both modified:   file.js

# View Conflict Details
cat file.js

# Output：
# <<<<<<< HEAD
# Local Changes
# =======
# Remote Content Editing
# >>>>>>> d4e5f6g

# Editing Files to Resolve Conflicts
# Keep the necessary content

# Mark the conflict as resolved
git add file.js

# Complete the merger
git commit

# Push to Remote
git push

# Pull conflict，I want to cancel
git merge --abort

# Or
git reset --merge

# RegardingrebasePull
git rebase --abort

# Only fast-forward merges are allowed
git pull --ff-only

# Output（If you can't fast-forward）：
# fatal: Not possible to fast-forward, aborting.

# Simulated Pull
git pull --dry-run

# Pull all remote repositories
git pull --all

# Set the Default Pull Method
git config pull.rebase true  # Use by defaultrebase
git config pull.rebase false # Use by defaultmerge
git config pull.ff only      # Fast-forward only

# Pullorigin
git pull origin

# Pullupstream
git pull upstream main

# Pull a specific branch
git pull origin feature

# Pull and Set Upstream
git pull --set-upstream origin feature

# Get Remote Updates（Do not merge）
git fetch origin

# Output：
# remote: Enumerating objects: 5, done.
# From https://github.com/user/repo
#    a1b2c3d..d4e5f6g  main        -> origin/main
#  * [new branch]      feature     -> origin/feature

# View Remote Branches
git branch -r

# Output：
#   origin/main
#   origin/feature

# View Remote Updates
git log origin/main

# Compare Differences
git diff main origin/main

# Manual Merge
git merge origin/main

# Orrebase
git rebase origin/main

# Method1：Directlypull
git pull origin main

# Method2：fetch + merge（Safer）
git fetch origin
git diff main origin/main  # View Differences
git merge origin/main      # Merge after confirmation

# Method3：fetch + rebase
git fetch origin
git diff main origin/main
git rebase origin/main

# 1. Pull the latest code before starting work
git checkout main
git pull --rebase origin main

# 2. Create a feature branch
git checkout -b feature/new-feature

# 3. Develop and Submit
git add .
git commit -m "feat: Add a New Feature"

# 4. Fetch updates again before pushing
git fetch origin
git rebase origin/main

# 5. Push
git push origin feature/new-feature

# Pull conflict
git pull

# 1. View Conflicting Files
git status

# 2. Using Tools to Resolve Conflicts
git mergetool

# 3. Or edit the file manually

# 4. Test Code
npm test

# 5. Mark the conflict as resolved
git add .

# 6. Complete the merger
git commit

# 7. Push
git push

# Regularly Synchronize Remote Updates
git fetch origin

# View the status of all branches
git branch -vv

# Output：
# * main    a1b2c3d [origin/main: behind 3] feat: Add Feature
#   develop d4e5f6g [origin/develop: ahead 2] Fix: FixBug
#   feature h7i8j9k [origin/feature] WIP: New Features

# Synchronize a Branch That Is Behind
git checkout main
git pull

# Or sync all branches
git pull --all