Environment

• GitExtensions version:
  Git Extensions 4.2.0.17591 Build bf814d4
  DPI 120dpi (125% scaling)
  Portable: False
  Microsoft.WindowsDesktop.App Versions

• GIT version: Git 2.43.0.windows.1

• OS version: Windows 10 Home 64-bit (Microsoft Windows NT 10.0.19045.0)

• .NET version: .NET 6.0.25

Issue description

Resetting new file will spawn an error dialog "The following files are unmerged and will not be reset"

Video capture (showing original bug but no more current behavior):

Steps to reproduce

edit: original bug has been handled. Now the not expected behavior happens when:

1. Create a new file and stage it
2. Make some other changes to the file
3. Go to GitExtensions and click Commit to open Commit dialog
4. Reset the unstaged changes and error dialog will appear

Did this work in previous version of GitExtensions?

Previous version does not have this issue.

Diagnostics

No response