How can I resolve conflicting files

yadm-dev / yadm

Yet Another Dotfiles Manager

https://yadm.io/

GNU General Public License v3.0

5.11k stars 175 forks source link

How can I resolve conflicting files #463

Closed Dunky-Z closed 1 year ago

Dunky-Z commented 1 year ago

This question is about

[ ] Installation
[ ] Initializing / Cloning
[ ] Alternate files
[ ] Jinja templates
[ ] Encryption
[ ] Bootstrap
[ ] Hooks
[x] 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.]

TheLocehiliosan commented 1 year ago

Can you give some more detail about the conflict?

What's the output of yadm status?

github-actions[bot] commented 1 year ago

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.

github-actions[bot] commented 1 year ago

This issue was closed because it has been labeled as stale for 7 days with no activity.