git hub add gitignore and gitattributes

TaiPark · Apr 27, 2015 · 09ca7f5 · 09ca7f5
1 parent 9e5c493
commit 09ca7f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.gitignore merge=ours
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+#github .gitignore file
+#@can not merge to dev git
 /ws/*
 /target/*
 /bin/*
@@ -9,3 +11,7 @@
 .idea/
 classes/
 *.iml
+conf/uat/*
+conf/fat/*
+conf/prod/*
+conf/fws/*