Skip to content

Conversation

@gluxon
Copy link
Owner

@gluxon gluxon commented Mar 30, 2022

This merge conflicts with 696d5c3.

For a version that does not merge conflict using the workspace-consistent: protocol

Screenshot of GitHub merge box:

Screen Shot 2022-03-30 at 1 34 53 AM

lockfileVersion: 5.3

importers:

  .:
    specifiers: {}

  packages/bar:
    specifiers:
      jest: ^27.5.1
      react: ^18.0.0
      react-dom: ^18.0.0
    dependencies:
      react: 18.0.0
      react-dom: [email protected]
    devDependencies:
      jest: 27.5.1

  packages/foo:
    specifiers:
<<<<<<< add-react-dom-to-foo
      react: ^17.0.2
      react-dom: ^17.0.2
    dependencies:
      react: 17.0.2
      react-dom: [email protected]
=======
      react: ^18.0.0
    dependencies:
      react: 18.0.0
>>>>>>> main

packages:

  # Packages section manually removed to focus on "importers" section.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants