Skip to content

docs: 修正冲突标记示例为标准Git格式 #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huang-dandan wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

docs: 修正冲突标记示例为标准Git格式 #560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/resolve_conflict.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

在发生冲突的文件中，冲突区域会有标记，比如：
```shell
<<<<<<< yours
你当前工作区的代码
<<<<<<< HEAD
你当前工作区的代码
=======
合并过来的代码
>>>>>>> their
合并过来的代码
>>>>>>> 分支名
```

可以使用任何编辑器手动解决冲突，也可以通过 TortoiseGit 提供的菜单解决冲突：选中冲突文件，在右键菜单中选择`TortoiseGit` → `Edit Conflicts` ，启动外部合并工具/冲突编辑器手动解决冲突。
Expand Down
Loading