Difference between git Pull and git Merge?

[mweaver]

(03-04-2017, 11:50 PM)joebordes Wrote: execute this and show me the output:

git diff config.template.php

Code:

[mweaver@merlin corebos]$ git diff config.template.php

diff --git a/config.template.php b/config.template.php
index 76231a8..03152cc 100644
--- a/config.template.php
+++ b/config.template.php
@@ -31,8 +31,8 @@ $USE_RTE = 'true';
 $PORTAL_URL = 'http://your_support_domain.tld/customerportal';

 // helpdesk support email id and support name (Example: 'support@your_support_domain.tld' and 'your-support name')
-$HELPDESK_SUPPORT_EMAIL_ID = '_USER_SUPPORT_EMAIL_';
-$HELPDESK_SUPPORT_NAME = 'your-support name';
+$HELPDESK_SUPPORT_EMAIL_ID = 'mweaver@compinfosystems.com';
+$HELPDESK_SUPPORT_NAME = 'CISS Support';
 $HELPDESK_SUPPORT_EMAIL_REPLY_ID = $HELPDESK_SUPPORT_EMAIL_ID;

 /* database configuration
@@ -44,13 +44,13 @@ $HELPDESK_SUPPORT_EMAIL_REPLY_ID = $HELPDESK_SUPPORT_EMAIL_ID;
       db_name
 */

-$dbconfig['db_server'] = '_DBC_SERVER_';
-$dbconfig['db_port'] = ':_DBC_PORT_';
-$dbconfig['db_username'] = '_DBC_USER_';
-$dbconfig['db_password'] = '_DBC_PASS_';
-$dbconfig['db_name'] = '_DBC_NAME_';
-$dbconfig['db_type'] = '_DBC_TYPE_';
-$dbconfig['db_status'] = '_DB_STAT_';
+$dbconfig['db_server'] = 'localhost';


:...skipping...
diff --git a/config.template.php b/config.template.php
index 76231a8..03152cc 100644
--- a/config.template.php
+++ b/config.template.php
@@ -31,8 +31,8 @@ $USE_RTE = 'true';
 $PORTAL_URL = 'http://your_support_domain.tld/customerportal';

 // helpdesk support email id and support name (Example: 'support@your_support_domain.tld' and 'your-support name')
-$HELPDESK_SUPPORT_EMAIL_ID = '_USER_SUPPORT_EMAIL_';
-$HELPDESK_SUPPORT_NAME = 'your-support name';
+$HELPDESK_SUPPORT_EMAIL_ID = 'mweaver@compinfosystems.com';
+$HELPDESK_SUPPORT_NAME = 'CISS Support';
 $HELPDESK_SUPPORT_EMAIL_REPLY_ID = $HELPDESK_SUPPORT_EMAIL_ID;

 /* database configuration
@@ -44,13 +44,13 @@ $HELPDESK_SUPPORT_EMAIL_REPLY_ID = $HELPDESK_SUPPORT_EMAIL_ID;
       db_name
 */

-$dbconfig['db_server'] = '_DBC_SERVER_';
-$dbconfig['db_port'] = ':_DBC_PORT_';
-$dbconfig['db_username'] = '_DBC_USER_';
-$dbconfig['db_password'] = '_DBC_PASS_';
-$dbconfig['db_name'] = '_DBC_NAME_';
-$dbconfig['db_type'] = '_DBC_TYPE_';
-$dbconfig['db_status'] = '_DB_STAT_';
+$dbconfig['db_server'] = 'localhost';
+$dbconfig['db_port'] = ':3306';

+$dbconfig['db_status'] = 'true';

 // TODO: test if port is empty
 // TODO: set db_hostname dependending on db_type