Skip to content
Browse files

doc: updated notes for using the got repo

  • Loading branch information...
1 parent b1e667c commit ae90ecde1dbefbd2e894d6d51d0bbc40a415453c @rhornig rhornig committed Aug 23, 2013
Showing with 25 additions and 2 deletions.
  1. +14 −0 INSTALL
  2. +6 −1 _scripts/track-config-files-off
  3. +5 −1 _scripts/track-config-files-on
@@ -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
7 _scripts/track-config-files-off
@@ -1,5 +1,10 @@
+# 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
6 _scripts/track-config-files-on
@@ -1,5 +1,9 @@
+# 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

0 comments on commit ae90ecd

Please sign in to comment.
Something went wrong with that request. Please try again.