Description of problem:

As a JBoss developer / admin I use jboss-cli to edit my configuration file (either directly on the gear with ssh or using rhc port-forwarding). When I do this the configuration file differs from that of what I have in my git repository.

Subsequent check-ins cause git to overwrite my configuration file. 

How reproducible: Very

Steps to Reproduce:
1. us jboss cli to edit the log level (follow https://access.redhat.com/solutions/240123) 
2. commit a change to your git repository. 

Actual results:

standalone.xml is revert to the prior configuration

Expected results:

standalone.xml should be merged, or a developer should get a notification. 

Additional info:

Thought on implementation: 

1: Improve git hook handling of file mismatch like this, and force a merge.
2: Provide an add-on monitoring cartridge that can tell or inform gear owner what needs to be changed or merged with there git repo. 
3: Watch man script to complete same function as 2

The following is a way to check a file's integrity and if it differs from what git has, provide a patch to resolve the difference. 

FILE_PATH=setup.py; if [[ "$(sha1sum $OPENSHIFT_DEPLOYMENTS_DIR/current/repo/$FILE_PATH | awk '{print $1}')" != "$(git show HEAD:$FILE_PATH | sha1sum | awk '{print $1}')" ]]; then diff -u <(cat $OPENSHIFT_DEPLOYMENTS_DIR/current/repo/$FILE_PATH) <(git show HEAD:$FILE_PATH);