Should changes in a package.json file be commited to a repository as well?

You need to commit package.json. All other developers, after pulling the code, will just need to perform npm install to get the latest dependencies required for the project. Whenever you or someone else wants to add new dependencies to the project you perform npm install <dependencyName> or npm install –save-dev <dependencyName>. Then package.json is automatically … Read more

Merging Issues with Git

Do this: git merge –abort git pull (to be sure you’re up-to-date) Now replace the contents of the README.md file with what you want it to say. If you don’t want it at all, do git rm README.md Then if you replaced the contents, commit and push those contents with: git add README.md git commit … Read more

What would be a good commit message for updating package versions using Conventional Commits?

If you use build scope consider this option: build(deps): bump React version to “17.0.2” Conventional commits are based on the Angular conventional commits. Angular’s CONTRIBUTING.md states: build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)

Git pull from someone else’s fork

Add a new remote (say, other) in your own repo. Pull other/<branch> changes into your local branch (say, add-other-changes). Push to your own forked repo (origin/add-other-changes). Now, when’re you done with add-other-changes branch, create a Pull request & merge it with origin/master. Pull other repo’s changes into your own repo: # go into your own … Read more