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

[WIP] fix: Merge ambiguous packages instead of throwing an error #5520

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[WIP] fix: Merge ambiguous packages instead of throwing an error #5520

wants to merge 11 commits into from

Commits on Oct 25, 2023

  1. fix: Merge ambiguous packages instead of throwing an error 

    (cherry picked from commit 1e62e4b)
    @raghav-deepsource @WarpspeedSCP
    raghav-deepsource authored and WarpspeedSCP committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    783d5d1 View commit details
    Browse the repository at this point in the history

  2. fix: import order

    @WarpspeedSCP
    WarpspeedSCP committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    5ec67fb View commit details
    Browse the repository at this point in the history

  3. fix: indents

    @WarpspeedSCP
    WarpspeedSCP committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    e7c99e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge branch 'master' into merge-master

    @WarpspeedSCP
    WarpspeedSCP committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    657de2f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Merge branch 'master' into merge-master

    @WarpspeedSCP
    WarpspeedSCP committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    42e7700 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Merge branch 'master' into merge-master

    @WarpspeedSCP
    WarpspeedSCP committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    608e297 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. fix: indents, and quodana issues

    @WarpspeedSCP
    WarpspeedSCP committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    ae3a382 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merge-master

    @WarpspeedSCP
    WarpspeedSCP committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    cc985f8 View commit details
    Browse the repository at this point in the history

  3. fix: checkstyle errors

    @WarpspeedSCP
    WarpspeedSCP committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    7b0a5dc View commit details
    Browse the repository at this point in the history

  4. chore: Add one test for 2 merged packages in same module

    @WarpspeedSCP
    WarpspeedSCP committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    373c3a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Merge branch 'master' into merge-master

    @WarpspeedSCP
    WarpspeedSCP committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    55f8e52 View commit details
    Browse the repository at this point in the history