The merge store dismisses its conflict warning once the status lists no conflicted file (resolved, committed or aborted) and replaces it on a new conflicted merge. The toast stack moves above areas registered with keepClearOf; the Changes window registers its commit box. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| Branches.test.ts | ||
| ChangesToolWindow.test.ts | ||
| DiffView.test.ts | ||
| Log.test.ts | ||
| Merge.test.ts | ||
| Remote.test.ts | ||
| Stash.test.ts | ||
| vcsStatus.test.ts | ||