microsoft / microsoft/vscode

Agent merge - split conflict resolution with branch being behind

Open
#334,896 0 comments 0 reactions 1 assignee Claimed by @benibenj View on GitHub
agents-window under-discussion
Dominant language
TypeScript
Stars
193k
Forks
42.4k
PR merge metrics
PR metrics pending

Description

Testing #334491

I would suggest splitting those options to:
* Resolve Conflicts
* Keep Branch Up to Date

Image

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.