doc: updated notes for using the got repo

INSTALL

@@ -69,6 +69,20 @@ Note:
   re-create your makefile. Run "make makefiles" again if you are building
   from the command line. (The IDE does it for you automatically)
 
+Note to GIT users:
+-------------------
+To make the installation simple, the GIT repo contains all IDE configuration files. 
+If you make local changes in the IDE you may need to disable the change tracking on 
+those files, so GIT will not insist committing those changes back on your next commit.
+You can use the _scripts/track-config-files-[on/off] scripts to enable/disable the 
+change tracking.
+
+To further ease the merging/rebasing operation the .cproject .nedfolders .oppbuildspec .project
+files are configured to be resolved using the 'ours' merge strategy.  Depending on your 
+GIT version you may need to enable the 'ours' merge driver for the project:
+
+    $ git config merge.ours.driver true
+
 VoIPTool feature
 ================
 

_scripts/track-config-files-off

@@ -1,5 +1,10 @@
 #!/bin/sh
+#
+# Runing this script will prevent GIT to pick up the changes on the next 
+# commit for the files that the IDE is using to store its configuration.
+# This will prevent the leaking of your local configuration (e.g. .cproject)
+# into the GIT repo, causing unnecessary merge conflicts later.
+#
 
 cd `dirname $0`/.. || { echo --- error changing to the inet root directory ---; exit 1;}
-
 git update-index --assume-unchanged .cproject .nedfolders .oppbuildspec .project

_scripts/track-config-files-on

@@ -1,5 +1,9 @@
 #!/bin/sh
+#
+# Execute this script if you want to make changes to the IDE configuration files 
+# (e.g. .cproject)  and you would like to see these changes picked up by GIT 
+# on the next commit. (if you have turned off the checking previously)
+#
 
 cd `dirname $0`/.. || { echo --- error changing to the inet root directory ---; exit 1;}
-
 git update-index --no-assume-unchanged .cproject .nedfolders .oppbuildspec .project