With the way I use aptana I am often overwriting a checkout branch on a dev box. once I get around to committing and updating the branch, git now complains I have updated files and refuses to continue.
error: The following untracked working tree files would be overwritten by checkout:
The following will reset the branch and respect the .gitignore files.
git clean -d -fx ""
git stash
git stash drop