简体繁体中英

How to automatically ignore git conflicts in package.json

原文 2020-08-31 20:44:08 2 1 javascript/ git/ github/ npm

In our app we have some shared npm packages that get updated pretty often. This leads to multiple pull requests with the same package getting a version update. So every time one of these pulls gets merged into master the other pull request will get a conflict on github. Is there a way to automatically take the highest package version so that we don't get conflicts? This slows us down a lot because we have to rerun all of our integration tests every time we fix these conflicts.

1 answers

No there is not. GitHub does no such management and it really is not the job of a distributed source control system.

How can I tell Prettier to ignore a package.json file?

How do I update the entries in package.json automatically?

Automatically updating dependencies in package.json

Is there a way to automatically build a dependency in package.json?

How to change the version of package in package.json

How to update the package.json version using semantic-release/git?

Automatically update package.json version and read it in code

How to add a new script in package.json

How to start custom package.json

How to run nodejs project in package.json

暂无

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

Related Question How can I tell Prettier to ignore a package.json file? How do I update the entries in package.json automatically? Automatically updating dependencies in package.json Is there a way to automatically build a dependency in package.json? How to change the version of package in package.json How to update the package.json version using semantic-release/git? Automatically update package.json version and read it in code How to add a new script in package.json How to start custom package.json How to run nodejs project in package.json

Related Tags

How to automatically ignore git conflicts in package.json

Question

1 answers

solution1 0 2020-08-31 20:46:07

solution1
0 2020-08-31 20:46:07