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

mergekit-mega: compound merging using multiple yaml documents in a single merge config #72

Merged
merged 12 commits into from
Jan 5, 2024
Merged

mergekit-mega: compound merging using multiple yaml documents in a single merge config #72

merged 12 commits into from
Jan 5, 2024

Commits on Jan 4, 2024

  1. feat(mega): add megamerge script 

    Will use multiple merge configurations as seperate documents
in a yaml file and do them in the correct order.
    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    3269cab View commit details
    Browse the repository at this point in the history

  2. feat(mega): add force flag to overwrite existing merges

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    5efe8af View commit details
    Browse the repository at this point in the history

  3. docs(mega): add example yaml for mergekit-mega

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    a55ad9c View commit details
    Browse the repository at this point in the history

  4. fix(mega): move to click and fix rest of pyproject scripts

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    30520f5 View commit details
    Browse the repository at this point in the history

  5. feat(mega): detect circular dependencies

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    5faea1a View commit details
    Browse the repository at this point in the history

  6. chore(mega): remove old comment and unused code

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    0038c55 View commit details
    Browse the repository at this point in the history

  7. feat(mega): use name in yaml and out_path cli arg instead of out_path… 

    … in yaml
    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    134af39 View commit details
    Browse the repository at this point in the history

  8. feat(mega): add error when name contains slash

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    fc6fb36 View commit details
    Browse the repository at this point in the history

  9. chore(mega): run black formatter

    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    1c5faba View commit details
    Browse the repository at this point in the history

  10. chore(mega): solve obvious linting errors 

    R1702 not fixed due to the  inherently nested nature of the config format
E1120 not fixed due to arguments handled by click
R0912 not fixed due to being introduced by click
    @nyxkrage
    nyxkrage committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    68cacc7 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. feat(mega): run isort, move dependcy checking to seperate function to… 

    … reuse for slices and models syntax
    @nyxkrage
    nyxkrage committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    48b46a0 View commit details
    Browse the repository at this point in the history

  2. fix(mega): allow other merges as base_model

    @nyxkrage
    nyxkrage committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    e030733 View commit details
    Browse the repository at this point in the history