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

Add support for merging a mixed set of different and equal modules #50

Merged
merged 7 commits into from
Nov 14, 2023
Merged

Add support for merging a mixed set of different and equal modules #50

merged 7 commits into from
Nov 14, 2023

Commits on Nov 14, 2023

  1. Make sure that a query for a parser always uses uppercase.

    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    5f78905 View commit details
    Browse the repository at this point in the history

  2. Improve handling of duplicate classes and methods.

    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    713bca8 View commit details
    Browse the repository at this point in the history

  3. Add support for merging a mixed set of different and equal modules. 

    Fixes  https://issues.jenkins.io/browse/JENKINS-72310
    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    4cd87f0 View commit details
    Browse the repository at this point in the history

  4. Typo.

    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    7920eda View commit details
    Browse the repository at this point in the history

  5. Fix warnings.

    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    fc7c8d8 View commit details
    Browse the repository at this point in the history

  6. Bump uhafner/autograding-github-action from 1.7.0 to 1.7.3 

    Bumps [uhafner/autograding-github-action](https://github.com/uhafner/autograding-github-action) from 1.7.0 to 1.7.3.
- [Release notes](https://github.com/uhafner/autograding-github-action/releases)
- [Commits](uhafner/autograding-github-action@v1.7.0...v1.7.3)

---
updated-dependencies:
- dependency-name: uhafner/autograding-github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @uhafner
    dependabot[bot] authored and uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6b24ce4 View commit details
    Browse the repository at this point in the history

  7. Simplify method.

    @uhafner
    uhafner committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    8e3b856 View commit details
    Browse the repository at this point in the history