As the error message says: git pull before you try to git push. Apparently your local branch is out of sync with your tracking branch. Depending on project rules and your workflow you might also want to use git pull –rebase.
Heroku has a set of default buildpacks, used when it needs to detect the language of your app.In order to do that detection, it runs the bin/detect command of each of those default buildpacks, until one of them returns a 0 exit code. This is the command for the node buildpack.As you can see, it requires a package.json to … Read more
EDIT: Since git 2.13, there is a command to save a specific path to the stash: git stash push <path>. For example: OLD ANSWER: You can do that using git stash –patch (or git stash -p) — you’ll enter interactive mode where you’ll be presented with each hunk that was changed. Use n to skip the files that you don’t want to … Read more
Try deleting index.lock file in your .git directory. rm -f .git/index.lock Such problems generally occur when you execute two git commands simultaneously; maybe one from the command prompt and one from an IDE.
Moving to an existing branch If you want to move your commits to an existing branch, it will look like this: You can store uncommitted edits to your stash before doing this, using git stash. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch WARNING: This method works because you … Read more
Simple Git 2.0+ solution: As of Git 2.0, the behavior has become simpler: You can configure git with push.default = current to make life easier: I added this so now I can just push a new branch upstream with -u will track remote branch of the same name. Now with this configuration, you will auto-guess the remote reference to … Read more
All the data Git uses for information is stored in .git/, so removing it should work just fine. Of course, make sure that your working copy is in the exact state that you want it, because everything else will be lost. .git folder is hidden so make sure you turn on the “Show hidden files, folders and disks” … Read more
should show all the local branches of your repo. The starred branch is your current branch. If you want to retrieve only the name of the branch you are on, you can do: or with Git 2.22 and above:
TL;DR: git branch –set-upstream-to origin/solaris The answer to the question you asked—which I’ll rephrase a bit as “do I have to set an upstream”—is: no, you don’t have to set an upstream at all. If you do not have upstream for the current branch, however, Git changes its behavior on git push, and on other commands as well. The … Read more
git diff can show you the difference between two commits: Or, equivalently: Note you must specify the relative path to the file. So if the file were in the src directory, you’d say src/myfile.cs instead of myfile.cs. Using the latter syntax, if either side is HEAD it may be omitted (e.g., master.. compares master to HEAD). You may also be interested in mybranch…master (from git diff documentation): This form is … Read more