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 Dx 2358 merge #3203

Merged
merged 40 commits into from
Apr 1, 2024
Merged

Fix Dx 2358 merge #3203

merged 40 commits into from
Apr 1, 2024

Conversation

MDrakos
Copy link
Member

@MDrakos MDrakos commented Mar 28, 2024

TaskDX-2358 Fix the hundreds of linter warnings/errors in the repo.

@mitchell-as
Copy link
Contributor

Please point out which files you had to manually merge. I'd prefer not to review all 200+ files again.

@@ -206,7 +206,7 @@ func NewNamespacePlatform() Namespace {
func NewOrgNamespace(orgName string) Namespace {
return Namespace{
nsType: NamespaceOrg,
value: fmt.Sprintf("%s/", orgName),
Copy link
Member Author

Choose a reason for hiding this comment

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

This is where the conflict was.

@MDrakos
Copy link
Member Author

MDrakos commented Apr 1, 2024

Please point out which files you had to manually merge. I'd prefer not to review all 200+ files again.

Done #3203 (comment)

@MDrakos MDrakos merged commit 29f946d into master Apr 1, 2024
7 of 8 checks passed
@MDrakos MDrakos deleted the DX-2358-merge branch April 1, 2024 15:36
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.

4 participants