search

koeqaife / hyprland-material-you

Dynamic and elegant desktop setup inspired by Material You, featuring auto-generated colors, fluid animations, and ripple effects for a cohesive, customizable user experience.
GNU General Public License v3.0
489 stars 23 forks source link

Can't update / Don't know how to #79

Closed dalmatheo closed 1 month ago

dalmatheo commented 1 month ago

Hello, so I tried to execute: ./update.sh in the dotfiles folder to update the hyprland material you. It prompted me an error saying that: Cannot update: Changes detected in files. :: You can write "$ git diff-index --name-only HEAD --" to see which files have changed :: use --force to ignore changes I tried to use ./update.sh --force to continue but it prompted me with an error: error: Your local changes to the following files would be overwritten by merge: hypr/conf/custom.conf hypr/conf/input.conf Please commit your changes or stash them before you merge. Aborting

I don't really know how to fix that, even tho I'm prettier it's because I edited some keybinds in the input.conf instead of custom.conf

koeqaife commented 1 month ago

git reset --hard origin/main and then use update.sh

dalmatheo commented 1 month ago

error: Entry 'hypr/conf/custom.conf' not uptodate. Cannot merge. fatal: Could not reset index file to revision 'origin/main'.

dalmatheo commented 1 month ago

I did that to fix it: git update-index --really-refresh