Fixing the error: nothing added to commit but untracked files present

Question

Hi everyone, I'm learning about git. While working, I try do the git pull on the prod server. As a result, I get the message:

Optimization/language/languageUpdate.php
 email_test.php
 nothing added to commit but untracked files present (use "git add" to track)
 Please move or remove them before you can merge.

What can I do about the “nothing added to commit but untracked files present” issue? Is there a better approach?

hdtutoria · Accepted Answer

The cause: This error happens because you add files to your local machine and then try to pull a remote copy of a repository without adding those files to the repository. The solution: To fix this error, you may either add the untracked files to your Git repository (as advised by the warning message) or add them to your .gitignore file. Using git add to add the files:

git add Optimization/language/languageUpdate.php
git add email_test.php

Add the following lines to your .gitignore file to ignore the files:

/Optimization/language/languageUpdate.php
/email_test.php

After that, either option should allow the git pull to succeed.

Rose Jean · Answer

We could also do this instead of manually adding each file:

git add --all

OR

git add -A

This will also delete any files that are not present or deleted (Tracked file in the current work directory which are currently absent).

You would only need to add files that are tracked and have been modified.

git add -u

What's the difference between git add . and git add --all?

Caleb Roy · Answer

We could also do this instead of manually adding each file:

git add --all

OR

git add -A

This will also delete any files that are not present or deleted (Tracked file in the current work directory that are currently absent).

You would only need to add files that are tracked and have been modified.

git add -u

What's the difference between git add . and git add --all?

Sign Up

Sign In

Forgot Password

ITtutoria Latest Questions

Fixing the error: nothing added to commit but untracked files present