Issues applying a branch with conflicts

[jamal]

This may be related to #2659, but I'm unsure due to lack of details so writing this up as a separate issue.

I have a branch that has not been merged yet, that has a few conflicts with the main branch. When I try to apply it, it shows in the workspace with a warning: "This virtual branch conflicts with upstream changes. Please resolve all conflicts and commit before you can continue."

The following are things I consider bugs or non-UX issues:

1. After making a change to one file, the UI state changes to show a "Please commit your resolved conflicts to continue" and stops showing the warn icon for the files with conflicts. This leaves me with no way to verify what is left to resolve, besides those files all having a locked icon as well. But, some of the locked files do not have conflicts.
2. Unable to Use git mergetool with gitbutler due to Conflict Detection Issue #3149 already brought this up, but git is unaware of the "apply" so it is not possible to see conflicts in git status, or use things like git mergetool

The following are UX things that may make this process better, but these are also my opinion:

1. All files with conflicts show a "lock" icon which is a bit confusing, what is the locked state supposed to indicate? There are also files without conflicts that are locked.
2. There is no way to filter or sort by file state, to help me list the files with conflicts. When there are 100s of changed files in a branch, this gets complicated to view.
3. There is no way to apply changes in the GitButler UI.