Skip to content

Offer autostash for merges #11764

@MisterAI

Description

@MisterAI

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

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions