-
Notifications
You must be signed in to change notification settings - Fork 65
Add stash support for git-pull #1732
Copy link
Copy link
Labels
enhancementNew feature or requestNew feature or requestgitgit version management tool integrationgit version management tool integrationsettingside-settings repo and replated processes and featureside-settings repo and replated processes and features
Milestone
Metadata
Metadata
Assignees
Labels
enhancementNew feature or requestNew feature or requestgitgit version management tool integrationgit version management tool integrationsettingside-settings repo and replated processes and featureside-settings repo and replated processes and features
Type
Projects
Status
✅ Done
Feature idea
The problem described in #1028 can also come from local changes in your settings that have not been committed yet.
This error can then also be confusing for the IDEasy end-user.
For ideal UX we should consider to detect changes, and in such case do the following:
. log a message (even consider an active confirmation question) that local changes were detected and can be stashed automatically (if we ask a question we could also have option to revert the changes).
.
git stash.
git pull.
git stash popAdditional context
This feature could also be used in the future to improve UX for settings from code-repository that currently requires
--forceto pull changes onide updateto avoid conflicts with code changes by IDEasy automatically pulling in changes.