Skip to content

Fixes https://github.com/microsoft/vscode-copilot/issues/10610 #250852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025

Conversation

hediet
Copy link
Member

@hediet hediet commented Jun 6, 2025

@hediet hediet self-assigned this Jun 6, 2025
@hediet hediet enabled auto-merge (rebase) June 6, 2025 13:44
@vs-code-engineering vs-code-engineering bot added this to the June 2025 milestone Jun 6, 2025
Tyriar
Tyriar previously requested changes Jun 6, 2025
@@ -76,6 +76,10 @@ export class MergeDiffComputer implements IMergeDiffComputer {
}

assertFn(() => {
/*
// This does not hold (see https://github.com/microsoft/vscode-copilot/issues/10610)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we replace this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a todo in the code. The assert is valuable for me.

@hediet hediet dismissed Tyriar’s stale review June 12, 2025 10:14

tracked by todo

@hediet hediet merged commit 2eed366 into main Jun 12, 2025
8 checks passed
@hediet hediet deleted the hediet/b/husky-donkey branch June 12, 2025 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants