npm 5 was released today and one of the new features include deterministic installs with the creation of a package-lock.json file. Is this file supposed to be kept in source control? I’m assuming it’s similar to yarn.lock and composer.lock, both of which are supposed to be kept in source control. 12 Yes, package-lock.json is intended … Read more
I have many Git branches. How do I delete branches which have already been merged? Is there an easy way to delete them all instead of deleting them one by one? 4 48
This question already has answers here: How can I make Git “forget” about a file that was tracked, but is now in .gitignore? (31 answers) Closed 4 years ago. I have an already initialized Git repository that I added a .gitignore file to. How can I refresh the file index so the files I want … Read more
I was writing a simple script on the school computer, and committing the changes to Git (in a repo that was in my pen drive, cloned from my computer at home). After several commits, I realized I was committing stuff as the root user. Is there any way to change the author of these commits … Read more
I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that the other version of the file is good and that mine is bad so all my changes should be abandoned. How can I do this? 1 15 Since your pull was unsuccessful … Read more
I have made some changes to a file which has been committed a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous version. I have done a git log along with a git diff to find the revision I need, but just … Read more
How do I discard changes in my working copy that are not in the index? 3 37
How do I force an overwrite of local files on a git pull? The scenario is the following: A team member is modifying the templates for a website we are working on They are adding some images to the images directory (but forgets to add them under source control) They are sending the images by … Read more
I don’t want to rename a remote branch, as described in Rename master branch for both local and remote Git repositories. How can I rename a local branch which hasn’t been pushed to a remote repository? In case you need to rename a remote branch as well: How do I rename both a Git local … Read more
Want to improve this post? Provide detailed answers to this question, including citations and an explanation of why your answer is correct. without enough detail may be edited or deleted. What are the differences between git pull and git fetch? 3 38
