Git: إدارة فروع Git والتطوير المتوازي

# View Branch Files
cat .git/refs/heads/main

# Output：
# a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0

# View local branches
git branch

# Output：
# * main
#   develop
#   feature

# * Indicates the current branch

# View Branches and Last Commit
git branch -v

# Output：
# * main    a1b2c3d feat: Add a login feature
#   develop d4e5f6g Fix: FixBug
#   feature h7i8j9k WIP: New Features

# View detailed branch information
git branch -vv

# The output includes information about the upstream branch：
# * main    a1b2c3d [origin/main] feat: Add a login feature

# View All Branches（Local+Remote）
git branch -a

# Output：
# * main
#   develop
#   remotes/origin/HEAD -> origin/main
#   remotes/origin/main
#   remotes/origin/develop
#   remotes/origin/feature

# View only remote branches
git branch -r

# Output：
#   origin/HEAD -> origin/main
#   origin/main
#   origin/develop
#   origin/feature

# Create a Branch（Based on the current commit）
git branch feature

# Create a branch and specify its starting point
git branch feature a1b2c3d

# Create a branch based on a specific tag
git branch v1.1-branch v1.0.0

# Create a branch and switch to it immediately
git checkout -b feature

# New Grammar（Recommendations）
git switch -c feature

# Created from a remote branch
git checkout -b feature origin/feature

# Or
git switch -c feature origin/feature

Feature Branch：feature/user-auth
         feature/shopping-cart
         feature/payment-integration

Fix Branch：fix/login-error
         fix/memory-leak

Thermal Repair Branch：hotfix/critical-security-issue
           hotfix/payment-failure

Release Branch：release/v1.0.0
         release/v2.1.0

Development Branch：develop

Main Branch: main (or master)

# Traditional Commands
git checkout feature

# New Command（Recommendations）
git switch feature

# Switch to the previous branch
git switch -

# Switch tomainBranch
git switch main

# Create and Switch
git switch -c new-feature

# Output：
# Switched to branch 'new-feature'

# View Current Status
git status

# Method1：Submit Changes
git add .
git commit -m "WIP: Save as Draft"
git switch feature

# Method2：Save Changes Temporarily（stash）
git stash
git switch feature
# After completing other tasks
git switch main
git stash pop

# Method3：Cancel Edits
git restore .
git switch feature

# Method4：Carry, Modify, Toggle（If there is no conflict）
git switch feature
# If the changes do not conflict with the new branch，Changes will be saved

# Delete Merged Branches
git branch -d feature

# Output：
# Deleted branch feature (was a1b2c3d).

# Delete Multiple Branches
git branch -d feature1 feature2

# Delete a merged remote branch
git push origin --delete feature

# Or
git push origin :feature

# Try deleting the unmerged branch
git branch -d feature

# Output Error：
# error: The branch 'feature' is not fully merged.
# If you are sure you want to delete it, run 'git branch -D feature'.

# Forced Deletion
git branch -D feature

# Output：
# Deleted branch feature (was a1b2c3d).

# View remote branch references
git branch -r

# Delete a local reference to a remote branch（Remotely Deleted）
git fetch -p

# Or
git remote prune origin

# View which remote branch references need to be cleaned up
git remote prune origin --dry-run

# Feature Branch
feature/user-authentication
feature/shopping-cart
feature/payment-integration

# BugFix
fix/login-validation-error
fix/memory-leak-issue

# Thermal Repair
hotfix/security-vulnerability
hotfix/critical-bug

# Published
release/v1.0.0
release/v2.1.0

# Experiment
experiment/new-architecture
spike/performance-optimization

# 1. Create a feature branch from main
git checkout main
git pull origin main
git checkout -b feature/user-auth

# 2. Developing on a feature branch
echo "auth code" > auth.js
git add auth.js
git commit -m "feat: Add User Authentication"

# 3. Stay in touch withmainSynchronize
git fetch origin
git merge origin/main
# or userebase
git rebase origin/main

# 4. Push Feature Branch
git push -u origin feature/user-auth

# 5. Create Pull Request (on GitHub)

# 6. Delete feature branches after merging
git checkout main
git pull origin main
git branch -d feature/user-auth
git push origin --delete feature/user-auth