Skip to content

session based changes to .codacy/codacy.yaml in local VS Code vs Github action lead to frequent merge conflicts and rebase complications #138

@vtjballeng

Description

@vtjballeng

.codacy/codacy.yaml is changing frequently in the same repo for the same code base while working in VS Code. It is almost always minor variations in the version of the same linters but sometimes it will be the addition or removal of specific linting tools. Sometimes the version is moving up, sometimes down. Sometimes it's several linter tools changing version.

The result is that it will present a merge conflict for unrelated changes and generally cause problems for our team. Our other linters and review tools do not do this.

The only workaround is to remove it from git tracking and add it to .gitignore but this shouldn't be necessary as the linter tools and versions should be much more consistent.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions