18 lines
681 B
Markdown
18 lines
681 B
Markdown
# Conflicts
|
|
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
|
|
(This file will automatically be deleted before commit)
|
|
[[#Additional Instructions]] available below file list
|
|
|
|
- Not a file: .obsidian/graph.json
|
|
- [[SanPinPLM/相关操作/4.0-other/10.并发用户管理]]
|
|
|
|
# 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
|
|
``` |