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.

Sign up for GitHub

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

Jump to bottom

Catch merge conflict annotations #71

Merged
merged 4 commits into from
Nov 21, 2024
Merged

Catch merge conflict annotations #71

merged 4 commits into from
Nov 21, 2024

Commits on Nov 21, 2024

  1. Catch merge conflict annotations

    @hestonhoffman
    hestonhoffman authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    2ed848d View commit details
    Browse the repository at this point in the history

  2. Update styles/Datadog/merge_conflict.yaml

    @hestonhoffman
    hestonhoffman authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    fc65b34 View commit details
    Browse the repository at this point in the history

  3. Update styles/Datadog/merge_conflict.yaml

    @hestonhoffman
    hestonhoffman authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    4f86312 View commit details
    Browse the repository at this point in the history

  4. Fix merge conflict rule

    @hestonhoffman
    hestonhoffman committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    e165c1e View commit details
    Browse the repository at this point in the history