Conflicts in uncommited files doesn't kick feature back into staging area on conflict resolution

[jackparkinsongearset]

Version

0.14.13

Operating System

macOS

Distribution Method

dmg (Mac OS - Apple Silicon)

Describe the issue

When trying to resolve conflicts with the working changes, those changes are not popped back out of the Uncommited changes branch created to enable resolving conflicts.

How to reproduce (Optional)

1. Create a set of commits that depend on each other, along with working changes that are also dependent on the previously committed work
2. Uncommit one of the commits in the middle of the branch such that a commit further downstream is conflicted
3. Resolve those conflicts such that the working changes conflict on those conflicts
4. An uncommited changes branch will be created to resolve conflicts with the uncommitted changes - resolve conflicts here.

Result - a commit with name Uncommitted changes that needs to be manually uncommitted.

Expected behavior (Optional)

Expected behaviour - working changes are moved back into staged changes.

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting!

I did search for references of "uncommitted changes" but couldn't find any, something that is unexpected if there should be code that creates a branch or commit with these names/titles. Also, I wasn't aware of these complexities.

@Caleb-T-Owens will have much more insight though.