Skip to content

Remove crash workaround in .editorconfig#60535

Merged
mavasani merged 2 commits intodotnet:mainfrom
Youssef1313:patch-17
Jun 28, 2022
Merged

Remove crash workaround in .editorconfig#60535
mavasani merged 2 commits intodotnet:mainfrom
Youssef1313:patch-17

Conversation

@Youssef1313
Copy link
Copy Markdown
Member

No description provided.

@ghost ghost added Community The pull request was submitted by a contributor who is not a Microsoft employee. Area-IDE labels Apr 2, 2022
@mavasani
Copy link
Copy Markdown
Contributor

mavasani commented Apr 7, 2022

@Youssef1313 There are merge conflicts.

@jasonmalinowski
Copy link
Copy Markdown
Member

@mavasani This OK to merge now?

@Youssef1313
Copy link
Copy Markdown
Member Author

Ping @mavasani

@mavasani mavasani enabled auto-merge June 23, 2022 11:19
@mavasani
Copy link
Copy Markdown
Contributor

@Youssef1313 main branch is locked right now due to performance regressions. I have enabled auto-merge so it gets merged once the branch is unlocked.

@Youssef1313
Copy link
Copy Markdown
Member Author

@mavasani It seems all PRs with auto-merge enabled with the branch was locked are stuck. Can you manually merge this please? Thanks

@mavasani mavasani disabled auto-merge June 28, 2022 13:20
@mavasani mavasani merged commit 519058e into dotnet:main Jun 28, 2022
@ghost ghost added this to the Next milestone Jun 28, 2022
@Youssef1313 Youssef1313 deleted the patch-17 branch June 28, 2022 13:27
@RikkiGibson RikkiGibson modified the milestones: Next, 17.3 P3 Jun 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-IDE Community The pull request was submitted by a contributor who is not a Microsoft employee.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants