How can I resolve conflicting files
Dunky-Z opened this issue · comments
This question is about
- Installation
- Initializing / Cloning
- Alternate files
- Jinja templates
- Encryption
- Bootstrap
- Hooks
- Other
Describe your question
A conflict occurred when two computers synchronized dotfiles,
but I couldn't find conflict marks in the conflicting files, such as >>> marks.
How can I find out where the conflict is and resolve it?
Thanks!!!
[A clear and concise description of the question.]
Can you give some more detail about the conflict?
What's the output of yadm status?
This issue has been labeled as stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.
This issue was closed because it has been labeled as stale for 7 days with no activity.