You can’t merge with local modifications. Git protects you from losing potentially important changes.
You have three options:
- Commit the change using
git commit -m "My message"
- Stash it.Stashing acts as a stack, where you can push changes, and you pop them in reverse order.To stash, type
git stash
Do the merge, and then pull the stash:git stash pop
- Discard the local changesusing
git reset --hard
orgit checkout -t -f remote/branch
Or: Discard local changes for a specific fileusinggit checkout filename
Related Posts:
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- How do I undo the most recent local commits in Git?
- How to modify existing, unpushed commit messages?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Remove files from Git commit
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- Pushing empty commits to remote
- How to undo git reset –soft to get my changes back?
- How can I remove a commit on GitHub?
- What are the differences between “git commit” and “git push”?
- Git – Remove commit from history
- Differences between Commit, Commit and Push, Commit and Sync
- How to use Git Revert
- How do I properly force a Git push?
- How to remove local (untracked) files from the current Git working tree
- Git merge hotfix branch into feature branch
- Git submodule update
- What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
- How do I clone a specific Git branch? [duplicate]
- Git pushing to remote branch
- How to revert a merge commit that’s already pushed to remote branch?
- GitHub Error Message – Permission denied (publickey)
- Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
- How do I push a new local branch to a remote Git repository and track it too?
- How do you push a tag to a remote repository using Git?
- Gitignore not working
- How to revert multiple git commits?
- How do I rename both a Git local and remote branch name?
- How do I fix a Git detached head?
- Why does git say “Pull is not possible because you have unmerged files”?
- How can I git stash a specific file?
- How to cherry-pick multiple commits
- Another git process seems to be running in this repository
- rejected master -> master (non-fast-forward)
- Move the most recent commit(s) to a new branch with Git
- What does “Git push non-fast-forward updates were rejected” mean?
- How do I diff the same file between two different commits on the same branch?
- How to name and retrieve a stash by name in git?
- You have not concluded your merge (MERGE_HEAD exists)
- How to get the current branch name in Git?
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Is there a “theirs” version of “git merge -s ours”?
- Meaning of the GitHub message: push declined due to email privacy restrictions
- Is there a command to undo git init?
- How to undo ‘git reset’?
- Download a single folder or directory from a GitHub repo
- fatal: Not a valid object name: ‘master’
- Git and nasty “error: cannot lock existing info/refs fatal”
- Is there a “git touch” so I can push the same file with a new timestamp?
- Branch from a previous commit using Git
- How do I delete a local repository in git?
- Hard reset of a single file
- Hard reset of a single file
- How to remove remote origin from a Git repository
- Not a valid object name: ‘master’
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- git add remote branch
- How do I copy a version of a single file from one Git branch to another?
- Undo a git stash
- Undo git stash pop that results in merge conflict
- Set up git to pull and push all branches
- Invalid VCS root mapping – 3 errors on my project
- Unity Collaborate vs GitHub
- What is the difference between pull and clone in git?
- How do I clone a single branch in Git?
- how to reset develop branch to master
- “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
- SourceTree keeps asking for Github password
- Git’s local repository and remote repository — confusing concepts
- How to change the license for a project at Github?
- How do i git push specific branch?
- Git add all files modified, deleted, and untracked?
- How to switch back to ‘master’ with git?
- fatal: could not read Username for ‘https://github.com’: No such file or directory
- Github Authentication Failed – … GitHub does not provide shell access
- How do I pull files from remote without overwriting local files?
- How to keep a branch synchronized/updated with master?
- TortoiseGit-git did not exit cleanly (exit code 1)
- Your repository has no remotes configured to push to
- Specify an SSH key for git push for a given domain
- How do I “un-revert” a reverted Git commit?
- How to create a local branch from an existing remote branch?
- git push not send changes to remote git repository
- How to merge a specific commit in Git
- How do I clone a subdirectory only of a Git repository?
- How to use Git and Dropbox together?
- Git: Where exactly is the “working directory”?
- What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
- Updating and committing only a file’s permissions using git version control
- Create empty branch on GitHub
- Git – fatal: Unable to create ‘/path/my_project/.git/index.lock’: File exists
- What is the usual process of saving changes made at the CMS level into source control?
- Collaboratively develop a WordPress site
- Add latest commit info on login footer using login_footer hook
- Display GitLab repositories of the logged in user on a page
- How to tell which local branch is tracking which remote branch in Git?
- How to retrieve the last modification date of all files in a Git repository
- How do I edit git’s history to correct an incorrect email address/name [closed]