It comes down to whether the feature is used by one person or if others are working off of it. You can force the push after the rebase if it’s just you: However, if others are working on it, you should merge and not rebase off of master. This will ensure that you have a … Read more
Yes, package-lock.json is intended to be checked into source control. If you’re using npm 5+, you may see this notice on the command line: created a lockfile as package-lock.json. You should commit this file. According to npm help package-lock.json: package-lock.json is automatically generated for any operations where npm modifies either the node_modules tree, or package.json. … Read more
if you just want them to be the same thing then
git pull <remote> master:dev will fetch the remote/master branch and merge it into your local/dev branch. git pull <remote> dev will fetch the remote/dev branch, and merge it into your current branch. I think you said the conflicting commit is on remote/dev, so that is the branch you probably intended to fetch and merge. In … Read more
Make sure the project was cloned and not downloaded as a zip into the directory you are using (there should be C:\Users\paula\Git\OpenTripPlanner.git directory on your disk). and make sure your gpath to git executable is indicating the correct path.
Check out the aq branch, and rebase from master.
git push origin amd_qlp_tester will work for you. If you just type git push, then the remote of the current branch is the default value. Syntax of push looks like this – git push <remote> <branch>. If you look at your remote in .git/config file, you will see an entry [remote “origin”] which specifies url of the repository. So, in the first … Read more
The simplest way is to do: This will push tags and branches.
Pat Notz is correct. You can get the commit back so long as it’s been within a few days. git only garbage collects after about a month or so unless you explicitly tell it to remove newer blobs. You can see in the example that the file2 was removed as a result of the hard … Read more
As the message says: no changes added to commit (use “git add” and/or “git commit -a”) Git has a “staging area” where files need to be added before being committed, you can read an explanation of it here. For your specific example, you can use: (note the extra a in the flags, can also be written as git commit … Read more