ignore properties files

.gitignore

@@ -7,10 +7,10 @@ src/vitis/vas/public/
 src/vitis/vas/server/
 src/vitis/vas/ws_data/
 src/vitis/vas/tmp/
-src/vitis/vas/rest/.htaccess
-src/vitis/client/conf
-**/conf/properties*
-**/conf/version.inc
+# src/vitis/vas/rest/.htaccess
+# src/vitis/client/conf
+# **/conf/properties*
+# **/conf/version.inc
 src/vitis/client/modules/
 ! src/vitis/client/modules/vitis/
 src/vitis/vas/rest/ws/*

utils/pull_subtrees.sh

@@ -18,6 +18,14 @@ cd ..
 # Vitis
 echo "---- Pull vitis ----"
 git subtree pull --prefix src/vitis --squash -m "pull subtree"  "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master
+# Fichiers à ignorer les modifications
+git update-index --assume-unchanged conf/properties.json
+git update-index --assume-unchanged src/vitis/vas/rest/.htaccess
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_domain.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_post.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_server.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/version.inc
 
 # Modules
 if [[ $depsCount > 0 ]]; then
@@ -27,6 +35,11 @@ if [[ $depsCount > 0 ]]; then
 
 			# Ajoute le dépôt
 			git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
+
+			# fichiers à ignorer
+			git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/properties.inc
+			git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/properties_server.inc
+			git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/version.inc
 		fi
 	done
 fi