Skip to content

编辑器支持 Git 冲突标记解析渲染 #1200

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

Jump to bottom
Closed
88250 opened this issue Jan 20, 2021 · 0 comments
Closed

编辑器支持 Git 冲突标记解析渲染 #1200

88250 opened this issue Jan 20, 2021 · 0 comments
Assignees
@88250 @Vanessa219
Labels
Feature
Milestone
0.6.6

Comments

@88250
Copy link
Member

88250 commented Jan 20, 2021 

<<<<<<< HEAD
这里是本地原来的内容
=======
这里是云端拉取下来的内容
>>>>>>> feebfeb6bef44cf1384d51cdd7aef7e4197b8180

作为叶子块处理 88250/lute#131
@88250 88250 added the Feature label Jan 20, 2021
@88250 88250 self-assigned this Jan 20, 2021
@88250 88250 added this to the 0.6.6 milestone Jan 20, 2021
@88250 88250 mentioned this issue Jan 20, 2021
Closed
@88250 88250 closed this as completed Jan 21, 2021
88250 added a commit to siyuan-note/user-guide-en_US that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200
dddda96
88250 added a commit to siyuan-note/user-guide-zh_CN that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200
d5dd558
88250 added a commit to siyuan-note/user-guide-en_US that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200

Verified

This commit was signed with the committer’s verified signature.
Zuoqiu-Yingyi Yingyi / 颖逸
GPG key ID: 833DAD5428FF18A8
Verified
Learn about vigilant mode
488129b
88250 added a commit to siyuan-note/user-guide-zh_CN that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200

Verified

This commit was signed with the committer’s verified signature.
Zuoqiu-Yingyi Yingyi / 颖逸
GPG key ID: 833DAD5428FF18A8
Verified
Learn about vigilant mode
c897c7f
88250 added a commit to siyuan-note/user-guide-en_US that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
57ea03c
88250 added a commit to siyuan-note/user-guide-zh_CN that referenced this issue Jan 21, 2021
@88250
✨ 编辑器支持 Git 冲突标记解析渲染 siyuan-note/siyuan#1200
2f0e26c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@88250 88250

@Vanessa219 Vanessa219

Labels
Feature
Projects
None yet
Milestone
0.6.6
Development

No branches or pull requests
2 participants
@88250 @Vanessa219