Skip to content

Fix: Fixed crash when switching git branches during merge conflict #17894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
yaira2 merged 6 commits into from
Dec 3, 2025
Merged

Fix: Fixed crash when switching git branches during merge conflict #17894

yaira2 merged 6 commits into from
Dec 3, 2025
+83 −1

Conversation

@workbysaran
Copy link
Contributor

@workbysaran workbysaran commented Nov 21, 2025

Resolved / Related Issues
Fixed an issue where switching git branches during an active merge conflict caused a crash due to attempting to stash unmerged changes.

Closes #16934

Steps used to test these changes

  1. Create a merge conflict in a git repository
  2. Attempt to switch branches while the merge conflict is active
  3. Verify the new dialog appears with options to "Abort merge and switch" or "Stay and resolve conflicts"
  4. Test both options work correctly
  5. Verify normal branch switching and still works as expected

sentry[bot]
sentry bot reviewed Nov 21, 2025
View reviewed changes
@yaira2 yaira2 added the ready for review Pull requests that are ready for review label Nov 23, 2025
@yaira2 yaira2 force-pushed the sg/fix-git-crash-switch-merge-conflict branch from 39db459 to d60b268 Compare December 2, 2025 20:37
yaira2
yaira2 reviewed Dec 2, 2025
View reviewed changes
yaira2
yaira2 reviewed Dec 2, 2025
View reviewed changes
yaira2
yaira2 previously approved these changes Dec 2, 2025
View reviewed changes
workbysaran and others added 2 commits December 3, 2025 11:20
@workbysaran
Merge branch 'sg/fix-git-crash-switch-merge-conflict' of https://gith…
0ca73d2 
…ub.com/workbysaran/Files into sg/fix-git-crash-switch-merge-conflict
@workbysaran @yaira2
Apply suggestion from @yaira2
812e566 
Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com>
Signed-off-by: Saravanan G <workbysaran@gmail.com>
yaira2
yaira2 approved these changes Dec 3, 2025
View reviewed changes
Copy link
Member

@yaira2 yaira2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed ready for review Pull requests that are ready for review labels Dec 3, 2025
@yaira2 yaira2 merged commit ddeb2ff into files-community:main Dec 3, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yaira2 yaira2 yaira2 approved these changes

+1 more reviewer

@sentry sentry[bot] sentry[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bug: Files crashes when switching git branch during a merge conflict

2 participants

@workbysaran @yaira2