You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
799 B
Markdown
21 lines
799 B
Markdown
# Conflicts
|
|
Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
|
|
(This file will automatically be deleted before commit)
|
|
[[#Additional Instructions]] available below file list
|
|
|
|
- Not a file: .obsidian/community-plugins.json
|
|
- [[Haina/Templates/W-log]]
|
|
- [[Haina/Weekly/2025/2025-W16]]
|
|
- [[Haina/Weekly/2025/2025-W17]]
|
|
- [[Haina/项目/HT数据分析/CT商旅数据统计]]
|
|
|
|
# Additional Instructions
|
|
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
|
|
|
```diff
|
|
<<<<<<< HEAD
|
|
File changes in local repository
|
|
=======
|
|
File changes in remote repository
|
|
>>>>>>> origin/main
|
|
``` |