-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Closed
Labels
📭 needs: author feedbackMore info/confirmation awaited from OP; issues typically get closed after 30 days of inactivityMore info/confirmation awaited from OP; issues typically get closed after 30 days of inactivitytype: feature request
Description
Feature description
When merging another branch into my current branch the merge often fails because it would overwrite local changes, suggesting me to stash them first. Then I need to close the merge dialogue, open the stashing dialogue, stash all changes, close the stashing dialogue again, open the merge dialogue again, merge and finally apply the latest stash again. So all in all a pretty cumbersome procedure is necessary. Instead it would be great if GitExtensions would offer an autostash option in this case which stashes all local changes, does the merge and afterwards applies the stashed changes again.
Environment
- GitExtensions version: 4.2.0.17591
- GIT version: 2.44.0.windows.1
- OS version: Microsoft Windows NT 10.0.19045.0
- .NET version: 6.0.30
Metadata
Metadata
Assignees
Labels
📭 needs: author feedbackMore info/confirmation awaited from OP; issues typically get closed after 30 days of inactivityMore info/confirmation awaited from OP; issues typically get closed after 30 days of inactivitytype: feature request