This is the safest solution:
git stash
Now you can do whatever you want without fear of conflicts.
For instance:
git checkout origin/master
If you want to include the remote changes in the master branch you can do:
git reset --hard origin/master
This will make you branch “master” to point to “origin/master”.
Related Posts:
- How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- error: src refspec master does not match any
- How to cherry pick from 1 branch to another
- How to Git stash pop specific stash in 1.8.3?
- How do I revert a Git repository to a previous commit?
- How to merge branch to master?
- How do I force git pull to overwrite everything on every pull?
- What happens when I do git pull origin master in the develop branch?
- What is the `git restore` command and what is the difference between `git restore` and `git reset`?
- What does ‘git blame’ do?
- Git fetch remote branch
- What is Git pruning?
- Reset local repository branch to be just like remote repository HEAD
- How do I push a new local branch to a remote Git repository and track it too?
- Practical uses of git reset –soft?
- LF will be replaced by CRLF in git – What is that and is it important? [duplicate]
- github changes not staged for commit
- Git error: “Please make sure you have the correct access rights and the repository exists”
- Undoing a git rebase
- How do I pull my project from github?
- How to resolve merge conflicts in a Git repository
- Difference between Git and GitHub
- Could not open a connection to your authentication agent
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- Hard reset of a single file
- How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
- How do I revert all local changes in Git managed project to previous state?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- How to compare files from two different branches
- Why do I have to “git push –set-upstream origin
“? - How do you create a remote Git branch?
- Move the most recent commit(s) to a new branch with Git
- rejected master -> master (non-fast-forward)
- How to name and retrieve a stash by name in git?
- Create a tag in a GitHub repository
- How can I delete a file from a Git repository?
- Git: Could not resolve host github.com error while cloning remote repository in git
- How to pull a specific branch from Github
- Make an existing Git branch track a remote branch?
- How to fully delete a git repository created with init?
- How do you create a remote Git branch?
- How do I update or sync a forked repository on GitHub?
- Git reset single file in feature branch to be the same as in master
- What is difference between ‘git reset –hard HEAD~1’ and ‘git reset –soft HEAD~1’?
- How can I reset or revert a file to a specific revision?
- Git – Undo pushed commits
- How to remove the shallow clone warning from HomeBrew
- Git Giving “fetch first” error when trying to push
- Files not updating using ‘git pull’
- Pull request vs Merge request
- What is the difference between `git merge` and `git merge –no-ff`?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- error: cannot lock ref.. ‘refs/tags’ exists; cannot create ‘refs/tags/
- git checkout tag, git pull fails in branch
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - How can I copy the content of a branch to a new local branch?
- Git: “please tell me who you are” error
- ! [rejected] master -> master (fetch first)
- How to git add a whole folder
- How to change folder with git bash?
- Git:nothing added to commit but untracked files present
- Git how to clone with SSH key, username
- fatal: This operation must be run in a work tree
- How to replace local branch with remote branch entirely in Git?
- Git diff against a stash
- How to commit changes to another pre-existent branch
- How to revert a “git rm -r .”?
- “git checkout
” is changing branch to “no branch” - How do I push a local Git branch to master branch in the remote?
- How to clone git repository with specific revision/changeset?
- How to compare a local Git branch with its remote branch
- How do I list all of the files in a commit?
- Git keeps prompting me for a password
- How to permanently remove few commits from remote branch
- Resolve Git merge conflicts in favor of their changes during a pull
- Git stash pop- needs merge, unable to refresh index
- Found a swap file by the name
- Git – Remove commit from history
- List submodules in a Git repository
- Is there a git-merge –dry-run option?
- How can I reconcile detached HEAD with master/origin?
- Add all files to a commit except a single file?
- How do I run git log to see changes only for a specific branch?
- How to search in commit messages using command line?
- failed to push some refs to [email protected]
- How to update Git clone
- How to get changes from another branch
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- key_load_public: invalid format
- Difference between git stash pop and git stash apply
- git fetch doesn’t update my local repository
- How do I show the changes which have been staged?
- Git push hangs when pushing to Github?
- I use SourceTree with Git but need to work with SVN repistory, what options do I have?
- GIT and Development URL’s point to production
- Could not find wp-load.php issue
- Theme/Plugin/Widget Data and Staging/Production Servers
- SSH git — How to pull a folder from repo, but not delete other directories & files on deployment server [closed]
- Best workflow for Git theme development with plugins [closed]