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 proper error when conflicting paths are detected #20918

Merged
merged 5 commits into from Jan 11, 2021
Merged

Add proper error when conflicting paths are detected #20918

merged 5 commits into from Jan 11, 2021

Commits on Jan 8, 2021

  1. Add proper error when conflicting paths are detected

    @ijjk
    ijjk committed Jan 8, 2021
    Copy the full SHA
    859fdb7 View commit details
    Browse the repository at this point in the history

  2. ensure ssr page conflict is caught also

    @ijjk
    ijjk committed Jan 8, 2021
    Copy the full SHA
    999a815 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. Merge remote-tracking branch 'upstream/canary' into conflicting-ssg-e… 

    …rror

# Conflicts:
#	packages/next/build/index.ts
#	packages/next/build/utils.ts
    @ijjk
    ijjk committed Jan 11, 2021
    Copy the full SHA
    38a5fb9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'canary' into conflicting-ssg-error

    @kodiakhq
    kodiakhq[bot] committed Jan 11, 2021
    Copy the full SHA
    c9b9592 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'canary' into conflicting-ssg-error

    @ijjk
    ijjk committed Jan 11, 2021
    Copy the full SHA
    4fe1cbd View commit details
    Browse the repository at this point in the history