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

Change lock file merge strategy to look for .yml instead of .yaml files #3065

Merged
merged 1 commit into from
Nov 20, 2023

Conversation

bendnorman
Copy link
Member

PR Overview

I'm still getting merge conflicts between environment files. I don't think the merge strategy is working because it's looking for .yaml files instead of .yml files.

PR Checklist

  • Merge the most recent version of the branch you are merging into (probably dev).
  • All CI checks are passing. Run tests locally to debug failures
  • Make sure you've included good docstrings.
  • For major data coverage & analysis changes, run data validation tests
  • Include unit tests for new functions and classes.
  • Defensive data quality/sanity checks in analyses & data processing functions.
  • Update the release notes and reference reference the PR and related issues.
  • Do your own explanatory review of the PR to help the reviewer understand what's going on and identify issues preemptively.

Copy link
Member

@zaneselvans zaneselvans left a comment

Choose a reason for hiding this comment

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

🤦🏼

@zaneselvans zaneselvans merged commit f4fdb00 into dev Nov 20, 2023
6 checks passed
@zaneselvans
Copy link
Member

Merging because this error is making a mess in my other piddling little PRs dealing with dependency stuffs.

@zaneselvans zaneselvans deleted the fix-conda-lockfile-merge-strategy branch November 20, 2023 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants