Skip to content

Git - handle merge conflict refs#238557

Merged
lszomoru merged 1 commit intomainfrom
lszomoru/special-frog
Jan 23, 2025
Merged

Git - handle merge conflict refs#238557
lszomoru merged 1 commit intomainfrom
lszomoru/special-frog

Conversation

@lszomoru
Copy link
Copy Markdown
Member

Fixes #238554

@lszomoru lszomoru self-assigned this Jan 23, 2025
@lszomoru lszomoru enabled auto-merge (squash) January 23, 2025 11:51
@lszomoru lszomoru added the git GIT issues label Jan 23, 2025
@lszomoru lszomoru added this to the January 2025 milestone Jan 23, 2025
@lszomoru lszomoru merged commit 4a5645c into main Jan 23, 2025
@lszomoru lszomoru deleted the lszomoru/special-frog branch January 23, 2025 12:06
HD787 pushed a commit to HD787/vscode that referenced this pull request Jan 24, 2025
@vs-code-engineering vs-code-engineering bot locked and limited conversation to collaborators Mar 9, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Git - merge editor fails to open

2 participants