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

Clarify app and pages file conflicting files #42415

Merged
merged 6 commits into from Nov 3, 2022
Merged

Clarify app and pages file conflicting files #42415

merged 6 commits into from Nov 3, 2022

Commits on Nov 3, 2022

  1. Clarify app<->pages file conflict

    @timneutkens
    timneutkens committed Nov 3, 2022
    Copy the full SHA
    554a06a View commit details
    Browse the repository at this point in the history

  2. Add !

    @timneutkens
    timneutkens committed Nov 3, 2022
    Copy the full SHA
    ed6d3ef View commit details
    Browse the repository at this point in the history

  3. Fix lint

    @timneutkens
    timneutkens committed Nov 3, 2022
    Copy the full SHA
    de59322 View commit details
    Browse the repository at this point in the history

  4. gate conflicting error

    @ijjk
    ijjk committed Nov 3, 2022
    Copy the full SHA
    133f36a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'canary' into fix/clarify-conflict-error

    @ijjk
    ijjk committed Nov 3, 2022
    Copy the full SHA
    92aa1c3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'canary' into fix/clarify-conflict-error

    @ijjk
    ijjk committed Nov 3, 2022
    Copy the full SHA
    8c811fb View commit details
    Browse the repository at this point in the history