Git - Do not see sparkle or Resolve with AI when merge conflict exists between two worktrees

[pierceboggan]

Testing #268883

1. Ask the agent to create two work trees
2. Ask the agent to create an intentional merge conflict between the two

Expected - Resolve with AI experience shows
Actual - Cannot see resolve with AI experience

[lszomoru]

Given the screenshot, are you expecting an "inline" action?
The action is currently only available in the context menu.