What is in your .gitignore when you use Spring Roo?

Question

I have a problem with a merge conflict in the target directory or log.roo. How do people solve this simple problem?

+4

user1162226 Mar 6 '12 at 16:24

2 answers

jbbarquero · Answer 1 · 2012-03-08T22:54:41+0000

log.roo application.log* .settings .classpath .project target .DS_Store

bluesman · Answer 2 · 2012-03-06T16:37:45+0000

If the goal is where your generated classes are located, then this is the first folder to be added to gitignore