Git:nothing added to commit but untracked files present

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: To ignore the files, add the following lines to your .gitignore: Either option should allow the git pull to succeed … Read more

Eclipse “Error: Could not find or load main class”

In your classpath you’re using an absolute path but you’ve moved the project onto a new machine with quite possibly a different file structure. In your classpath you should therefore (and probably in general if you’re gonna bundle JARS with your project), use relative pathing: In your .classpath change to

How can I Remove .DS_Store files from a Git repository?

Remove existing files from the repository: Add this line: to the file .gitignore, which can be found at the top level of your repository (or create the file if it isn’t there already). You can do this easily with this command in the top directory: Then commit the file to the repo:

Git merge with force overwrite

Not really related to this answer, but I’d ditch git pull, which just runs git fetch followed by git merge. You are doing three merges, which is going to make your Git run three fetch operations, when one fetch is all you will need. Hence: Controlling the trickiest merge The most interesting part here is git merge -X theirs. As root545 … Read more