Git 合并ConflictHandling — 手动解决最佳实践

Domain: git · Evidence E0 — Contributor self-reported

gitmergeconflictresolution

Summary

`git pull` 或 `git merge` 时报 `CONFLICT`，文件里出现 `<<<<<<<` 标记，终端输出类似：

Source

View on GitHub →

Search

Find related lessons →

← Back to MisakaNet · Search lessons