You get that message because you made changes in your local master and you didn’t push them to remote. You have several ways to “solve” it and it normally depends on how your workflow looks like:
- In a good workflow your remote copy of master should be the good one while your local copy of master is just a copy of the one in remote. Using this workflow you’ll never get this message again.
- If you work in another way and your local changes should be pushed then just
git push originassuming origin is your remote - If your local changes are bad then just remove them or reset your local master to the state on remote
git reset --hard origin/master
Related Posts:
- Undoing a git rebase
- How to cherry-pick multiple commits
- How to cherry-pick multiple commits
- How to git rebase a branch with the onto command?
- How do I delete a Git branch locally and remotely?
- What is git tag, How to create tags & How to checkout git remote tag(s)
- Difference between “git add -A” and “git add .”
- What is the best (and safest) way to merge a Git branch into master?
- Squash my last X commits together using Git
- How to apply a patch generated with git format-patch?
- Abort a Git Merge
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Git fetch remote branch
- Updating a local repository with changes from a GitHub repository
- How do I remove a submodule?
- Git push results in “Authentication Failed”
- What does “Changes not staged for commit” mean
- git: fatal: Could not read from remote repository
- Git push results in “Authentication Failed”
- Download single files from GitHub
- How do I update Homebrew?
- Git error when trying to push — pre-receive hook declined
- Ignoring directories in Git repositories on Windows
- How can I merge multiple commits onto another branch as a single squashed commit?
- Gitignore not working
- Could not open a connection to your authentication agent
- How to get just one file from another branch?
- git checkout a single file from another branch and put in different folder
- Update Git branches from master
- Stash only one file out of multiple files that have changed with Git?
- Create a branch in Git from another branch
- What is HEAD in Git?
- What are the differences between git remote prune, git prune, git fetch –prune, etc
- How to get the current branch name in Git?
- How can I git stash a specific file?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- How do you stash an untracked file?
- Filename too long in Git for Windows
- What is the difference between git rm –cached and git reset
? - What does git rev-parse do?
- git – pulling from specific branch
- How to name and retrieve a stash by name in git?
- GitHub: invalid username or password
- Why do I have to “git push –set-upstream origin
“? - Stash just a single file
- Git – Ignore node_modules folder everywhere
- How do I provide a username and password when running “git clone [email protected]”?
- How to undo ‘git reset’?
- “*** Please tell me who you are.” when using SSH key
- master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
- fatal: Not a valid object name: ‘master’
- Git and nasty “error: cannot lock existing info/refs fatal”
- How do I delete a local repository in git?
- git pull from master into the development branch
- Clone A Private Repository (Github)
- Throw away local commits in Git
- Hard reset of a single file
- How to remove remote origin from a Git repository
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Is there a “theirs” version of “git merge -s ours”?
- How to clone a specific Git tag
- How do I copy a version of a single file from one Git branch to another?
- Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
- Invalid VCS root mapping – 3 errors on my project
- What’s the significance of the “No newline at end of file” log?
- What is the difference between pull and clone in git?
- How do I clone a single branch in Git?
- Git update submodules recursively
- Do a “git export” (like “svn export”)?
- how to reset develop branch to master
- What does git push origin HEAD mean?
- “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
- How do I set up Eclipse/EGit with GitHub?
- Repository size limits for GitHub.com
- How to compare a local Git branch with its remote branch
- git push origin master does not work
- How to permanently remove few commits from remote branch
- Git clone verbose output?
- Could not create work tree dir ‘example.com’.: Permission denied
- Is there a git-merge –dry-run option?
- How to answer the git prompt in npm init for a local repo
- Add all files to a commit except a single file?
- Git says “Automatic merge failed”, what does it mean?
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- git pull remote branch cannot find remote ref
- How to configure git bash command line completion?
- How do I change the default location for Git Bash on Windows?
- How to stop tracking and ignore changes to a file in Git?
- Git push requires username and password
- WordPress with Git
- WordPress and Git – What folders should I track?
- Multiple copies of the same website: how to organize code/architecture?
- Pull latest stable release via git [closed]
- Why do the Roots theme CSS files not load (404)?
- Version control with a team of non-developers
- Painless way to track remote Git repo for WordPress updates
- Questions about Git and WordPress [duplicate]
- WordPress on git – need help with configuration
- How to retrieve the last modification date of all files in a Git repository