Where is the git conflict?

[sepulworld]

 omarchy-update
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

perhaps we could add some additional messaging for the user here? Like where the git conflict is so I can take action?

[sailoz]

note: currently due to bug of one of software uwsm (which is directly not part of Omarchy), you may not to want to update omarchy until it is fixed.
Vladimir-csp/uwsm#152 , which effected as shown in #688.

Once settled, you could do following.
did you change any files under ~/.local/share/omarchy ? You are not meant to touch them.

1. Please copy out any modifed files out to ~/ , OR
2. cd ~/.local/share/omarch; git stash ; git reset --hard
3. omarchy-update

[sepulworld]

I don't remember modifying anything to there. I did a git stash and proceeded with a Omarchy-update.

But now system seems broken. Just getting a blinking cursor upper right screen and some random flashes of text I can't read before they disappear.

[sailoz]

Despite the warning, you updated.

Here are steps to recover, discussed by another discord member: #693, if you want.

[sepulworld]

I didn't see your (admittedly fast response) until it was too late :(

Is this behavior similar to bug your linked?

[sepulworld]

Thanks @sailoz was able to downgrade uwsm to get back into action.