Git: دليل تفصيلي لعمليات الدمج وحل التعارضات في Git

git merge feature  # Merge feature into the current branch

# Usage--no-ffDisable Fast-Forward Merge
git merge --no-ff feature

# Output：
# Merge made by the 'ort' recursive strategy.
#  feature.js | 1 +
#  1 file changed, 1 insertion(+)
#  create mode 100644 feature.js

# View History
git log --oneline --graph --all

# Output：
# *   a1b2c3d (HEAD -> main) Merge branch 'feature'
# |\
# | * d4e5f6g (feature) Add feature
# |/
# * h7i8j9k Initial commit

# View Branch Status
git log --oneline --graph --all

# Output：
# * d4e5f6g (feature) Feature work
# | * a1b2c3d (HEAD -> main) Main work
# |/
# * h7i8j9k Initial commit

# MergefeatureBranch
git merge feature

# Output：
# Merge made by the 'ort' recursive strategy.
#  feature.js | 1 +
#  1 file changed, 1 insertion(+)

# View the merge results
git log --oneline --graph --all

# Output：
# *   k9l0m1n (HEAD -> main) Merge branch 'feature'
# |\
# | * d4e5f6g (feature) Feature work
# * | a1b2c3d Main work
# |/
# * h7i8j9k Initial commit

# Find the common ancestor of two branches
git merge-base main feature

# Output：
# h7i8j9k

# View the content to be merged
git diff $(git merge-base main feature) feature

# Or use the three-point syntax
git diff main...feature

# Modifying Files on a Branch
echo "main content" > file.js
git add file.js
git commit -m "Main modification"

# Switch tofeatureBranch
git switch feature

# Modify the same location in the same file
echo "feature content" > file.js
git add file.js
git commit -m "Feature modification"

# Switch back tomainCombine and Merge
git switch main
git merge feature

# Output：
# Auto-merging file.js
# CONFLICT (content): Merge conflict in file.js
# Automatic merge failed; fix conflicts and then commit the result.

# View Status
git status

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

# View Conflicting Files
cat file.js

# Output：
# <<<<<<< HEAD
# main content
# =======
# feature content
# >>>>>>> feature

# View Conflict Details
git diff

# Output：
# <<<<<<< HEAD
# -main content
# =======
# -feature content
# >>>>>>> feature

# Editing Files with Conflicts，Select the content to keep
cat file.js

# Method1：RetainmainChanges to
# main content

# Method2：RetainfeatureChanges to
# feature content

# Method3：Merge the changes from both
# main content
# feature content

# Mark the conflict as resolved
git add file.js

# Complete the merger
git commit

# Output：
# [main d4e5f6g] Merge branch 'feature'

# Using a Graphical Merge Tool
git mergetool

# Using Specific Tools
git mergetool --tool=vimdiff

# View available merge tools
git mergetool --tool-help

# UsagecheckoutSelect a Version
git checkout --ours file.js      # Select the current branch version
git checkout --theirs file.js    # Select a branch version to merge

<<<<<<< HEAD
Content of the current branch（HEAD）
=======
To merge the contents of the branches
>>>>>>> feature

# UsagerecursiveStrategy（Default）
git merge feature

# UsageoursStrategy（IgnorefeatureChanges to）
git merge -s ours feature

# UsagerecursiveStrategy Options
git merge -X ours feature    # In case of a conflict, prioritize the current branch
git merge -X theirs feature  # In the event of a conflict, prioritize the branch to be merged
git merge -X ignore-space-change feature  # Ignore changes in whitespace

# Compress and Merge
git merge --squash feature

# View Status
git status

# Output：
# Changes to be committed:
#   new file:   feature1.js
#   new file:   feature2.js

# Commit the compressed changes
git commit -m "Merge feature branch (squashed)"

# Advantages：Keep the main branch history clean
# Disadvantages：LostfeatureDetailed History of the Branch

# Merge but do not commit automatically
git merge --no-commit feature

# View the merge results
git status
git diff --staged

# If you're satisfied，Manual Submission
git commit -m "Merge feature branch"

# If you are not satisfied，Cancel Merge
git merge --abort

# Conflicts Arising from Mergers
git merge feature
# CONFLICT (content): Merge conflict in file.js

# Cancel Merge，Restore to the state prior to the merge
git merge --abort

# Or usereset
git reset --merge

# View All Merge Commits
git log --merges --oneline

# Output：
# d4e5f6g Merge branch 'feature'
# a1b2c3d Merge branch 'develop'

# View Unmerged Commits
git log --no-merges --oneline

# View details of the merge
git show --stat d4e5f6g

# Undo the Last Merge（Merge requests are still available）
git reset --hard HEAD~1

# UsagerevertRevoke Merger（Create a New Commit）
git revert -m 1 HEAD

# -m 1 Indicates that the first parent commit is being preserved（mainBranch）

# View Results
git log --oneline --graph