chrisgreen1993/snippetshare — pull request #1 by robmcvey (2012-06-07 10:34:21+00:00)
Title: .gitignore file so non-app files are not version controlled...

I've added a .gitignore file, this will stop git tracking things like hidden files and Aptana files which are not required for the app to run.

### To merge this

You can probably merge this here on Github if you trust what I've done ;)

It will merge my changes in to your master branch, creating a .gitignore and deleting the .project and .settings file/dir.

Use the tabs here on Github to see the changes.

Also make a backup of .settings and .project before you do anything :)

### Or

If you want to test it out first and get used to switching branches...(recommended!).

Take you time with each bit and try and let me know if you get stuck:

1. Locally, commit any work you have done so you are on clean working tree. `git status` should output `# On branch master nothing to commit (working directory clean)`
2. Create a branch locally with the same name as mine `git branch gitignore`
3. Switch to this new branch `git checkout gitignore`
4. At this point your branch `gitignore` is a replica of your current master, so pull my branch in to it:

`git pull git@github.com:robmcvey/snippetshare.git gitignore`

...so now it is a replica of MY branch.

5. Test away! Remember to backup .settings and .project before you do this.
6. Happy? Checkout master again `git checkout master` and merge my branch in `git merge gitignore` (or if you're not happy with what I've done come back here and leave a comment so I can fix any mistakes)
7. Now push master back to the repo so I can pull the master again and the cycle continues! `git push origin master`

![nap](http://images1.wikia.nocookie.net/__cb20091212162709/uncyclopedia/images/9/99/Napoleon_dancing.gif)