Skip to content
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

Support diff merge editor for Notebooks #213602

Merged
merged 1 commit into from
May 28, 2024
Merged

Support diff merge editor for Notebooks #213602

merged 1 commit into from
May 28, 2024

Conversation

DonJayamanne
Copy link
Contributor

@DonJayamanne DonJayamanne commented May 28, 2024

Fixes #160941

@VSCodeTriageBot VSCodeTriageBot added this to the May 2024 milestone May 28, 2024
@DonJayamanne DonJayamanne merged commit 50f2b2e into main May 28, 2024
7 checks passed
@DonJayamanne DonJayamanne deleted the issue160941 branch May 28, 2024 01:19
@microsoft microsoft locked and limited conversation to collaborators Jul 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

simple merge conflicts in notebooks require manually editing the ipynb json
3 participants