zed/assets/settings
Finn Evers 9b40411c6a
Fix bad GitHub merge queue merge (#54721)
No, sadly, the title is not a typo. See
https://www.githubstatus.com/incidents/zsg1lk7w13cf for the context.
I'll read with joy and popcorn through that root cause analysis.

It makes literally zero sense what happened here, but for some completly
bonkers reason GitHub completely messed up the merge queue with
https://github.com/zed-industries/zed/pull/54632.

I have no idea how it happened. It makes literally zero sense. A PR
going into the merge queue should have the same LoC when getting out of
it. GitHub obviously does not check this. GitHub causes extra work with
a feature that is supposed to save time.

Thanks, I guess.

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
2026-04-23 23:47:30 +00:00
..
default.json Fix bad GitHub merge queue merge (#54721) 2026-04-23 23:47:30 +00:00
default_semantic_token_rules.json languages: Improve semantic token highlighting for parameters and Python (#52130) 2026-03-23 16:10:55 +00:00
initial_debug_tasks.json Add trailing commas to all asset jsonc files following #43854 (#44891) 2025-12-15 15:09:52 +00:00
initial_local_debug_tasks.json Simplify debug launcher UI (#31928) 2025-06-02 21:24:08 +00:00
initial_local_settings.json Fix broken link in initial settings (#15119) 2024-07-25 08:25:27 -04:00
initial_server_settings.json Add trailing commas to all asset jsonc files following #43854 (#44891) 2025-12-15 15:09:52 +00:00
initial_tasks.json Don't save buffers by default when running tasks (#52976) 2026-04-02 13:09:29 +00:00
initial_user_settings.json Add trailing commas to all asset jsonc files following #43854 (#44891) 2025-12-15 15:09:52 +00:00