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

Fix issue with merging configs #6084

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Conversation

pkukielka
Copy link
Contributor

Test plan

Unit tests added.

Also before this fix problem was visible e.g. in duplicated shortcut tooltips next to the lens actions (due to property cody.advanced.agent.running being incorrectly overwritten).
After this fix problem should disappear.

Copy link
Contributor

@mkondratek mkondratek left a comment

Choose a reason for hiding this comment

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

Tested with sourcegraph/jetbrains#2588.

Works 🚀

@pkukielka pkukielka enabled auto-merge (squash) November 7, 2024 12:28
@pkukielka pkukielka merged commit 45d2d57 into main Nov 7, 2024
20 checks passed
@pkukielka pkukielka deleted the pkukielka/fix-config-merging branch November 7, 2024 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants