You have two options here. You can either add the untracked files to your Git repository (as the warning message suggested), or you can add the files to your .gitignore
file, if you want Git to ignore them.
To add the files use git add
:
git add Optimization/language/languageUpdate.php git add email_test.php
To ignore the files, add the following lines to your .gitignore
:
/Optimization/language/languageUpdate.php /email_test.php
Either option should allow the git pull
to succeed afterwards.
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?
- 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?
- How to commit changes to another pre-existent branch
- git: How to ignore all present untracked files?
- Move existing, uncommitted work to a new branch in Git
- What are the differences between “git commit” and “git push”?
- “git checkout
” is changing branch to “no branch” - Your branch is ahead of ‘origin/master’ by 3 commits
- Why I always Got Error “Push to origin/master was rejected”?
- How to resolve git status “Unmerged paths:”?
- Github Windows ‘Failed to sync this branch’
- How can I generate a Git patch for a specific commit?
- How do I list all of the files in a commit?
- Git keeps prompting me for a password
- How can I unstage my files again after making a local commit?
- Resolve Git merge conflicts in favor of their changes during a pull
- Git stash pop- needs merge, unable to refresh index
- Delete forked repo from GitHub
- Push local Git repo to new remote including all branches and tags
- Git – Remove commit from history
- Git merge without auto commit
- How to get Git to clone into current directory
- List submodules in a Git repository
- How can I reconcile detached HEAD with master/origin?
- How do you merge two Git repositories?
- How do I run git log to see changes only for a specific branch?
- How to get Git to clone into current directory
- Why is .gitignore not ignoring my files?
- How to search in commit messages using command line?
- Staging Deleted files
- How to get changes from another branch
- gerrit – git (pull vs checkout vs cherrypick) which is for what?
- GIT_DISCOVERY_ACROSS_FILESYSTEM not set
- 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?
- 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]