Git Stash Merge Solution
User error: Your local changes to the following files would be overwritten by merge: resources/js/app.js vite.config.js Please commit your changes or stash them before you merge. Aborting But don't want to commit Assistant If you don't want to commit your changes but still want to merge without losing them, you can use Git's stash feature. […]