Skip to content

Add stash support for git-pull #1732

@hohwille

Description

@hohwille

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 pop

Additional context

This feature could also be used in the future to improve UX for settings from code-repository that currently requires --force to pull changes on ide update to avoid conflicts with code changes by IDEasy automatically pulling in changes.

Metadata

Metadata

Assignees

Labels

enhancementNew feature or requestgitgit version management tool integrationsettingside-settings repo and replated processes and features

Projects

Status

✅ Done

Relationships

None yet

Development

No branches or pull requests

Issue actions