Do not commit the generated file MANIFEST.MF + ignore it (similar lik…

…e we do it on drools) to avoid merge conflicts when 2 different developers build and push their changes.
holdenk · May 18, 2011 · a156449 · a156449
1 parent 1822b3e
commit a156449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,6 @@
 /*.ipr
 /*.iws
 /*.iml
+
+# The META-INF directory is generated by the maven-felix-plugin
+/META-INF
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF