Hello.
My .gitignore is:
*.iws
*Db.properties
*Db.script
.settings
stacktrace.log
/*.zip
/plugin.xml
/*.log
/*DB.*
/cobertura.ser
.DS_Store
/target/
/out/
/web-app/plugins
/web-app/WEB-INF/classes
/.link_to_grails_plugins/
/target-eclipse/
When I push my commits I see target and its subdirs in
I have two branches: devel and master.
I'm using git as repository for some applications.
Usually I do changes under devel branch, commit and push.
Then I do a git checkout master, git merge devel and push and all done.
I always have done this but now, in a new application, when I do git merge
