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

feat: update merge packages info #79

Merged
merged 2 commits into from
Jul 10, 2024
Merged

feat: update merge packages info #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3142f3
feat: update merge packages info
rin-st Jul 9, 2024
30825c1
fix: merging message
rin-st Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion contributors/TEMPLATING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,19 @@ The special files and folders are:

## Merging package.json files

The package we use to merge package.json files [merge-packages](3) will use the last version of a dependency given a conflict. For example:
The package we use to merge `package.json` files [merge-packages](3) will attempt to find intersections of dependencies. If there is a conflict, the version from the last `package.json` will be taken.

For example:

```
version on file one: ~1.2.3
version on file two: ^1.0.0
resulting version: ~1.2.3

version on file one: ^1.0.0
version on file two: >=1.2.0 <1.3.0
resulting version: ~1.2.0

version on file one: 1.0.0
version on file two: 0.1.0
resulting version: 0.1.0
carletex marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading