Merge pull request mendix#10720 from mendix/kk-vc-mergebranch

Merging a Version Control update to another file

Author: katarzyna-koltun-mx

content/en/docs/refguide/version-control/version-control-troubleshooting/_index.md

@@ -109,13 +109,28 @@ When filing a Git support issue with Mendix Support, attach the log files by doi
 The properties described below might contain personal information. We advise you to make sure that all the private information is removed before sharing them. 
 {{% /alert %}}
 
-There are properties of the Git repository that provide you with information useful for troubleshooting different issues. Execute the following using the command line in the app’s folder:
+Several properties of the Git repository can provide you with information useful for troubleshooting different [general](#general-properties) and [configuration](#config-properties) issues. You can view them by executing the commands from the command line in the app's folder.
 
-`git status -b` — provides information on the current state of the repository
+#### General {#general-properties}
 
-`git remote -v` — lists the remotes specified for the repository
+The following properties provide general information about the repository status and remotes.
 
-`git config --list --show-origin --show-scope` — provides information on user's Git config
+* `git status -b` - Provides information on the current state of the repository.
+* `git remote -v` - Lists the remotes specified for the repository.
+
+#### Configuration {#config-properties}
+
+Git stores configuration at several levels:
+
+* System - Affects the entire Git installation.
+* Global - Affects the current user.
+* Local - Affects a specific repository.
+
+More specific configuration overrides more generic configuration (for example, local overrides global). You can inspect the configuration and see where each value is defined by using the following command:
+
+`git config --list --show-origin --show-scope`
+
+This command shows all active configuration values along with the file and scope they come from.
 
 ### Cannot Create Package from a Revision{#cannot-create-package}
 

content/en/docs/refguide10/version-control/version-control-troubleshooting/_index.md

@@ -111,13 +111,28 @@ When filing a Git support issue with Mendix Support, attach the log files by doi
 The properties described below might contain personal information. We advise you to make sure that all the private information is removed before sharing them. 
 {{% /alert %}}
 
-There are properties of the Git repository that provide you with information useful for troubleshooting different issues. Execute the following using the command line in the app’s folder:
+Several properties of the Git repository can provide you with information useful for troubleshooting different [general](#general-properties) and [configuration](#config-properties) issues. You can view them by executing the commands from the command line in the app's folder.
 
-`git status -b` — provides information on the current state of the repository
+#### General {#general-properties}
 
-`git remote -v` — lists the remotes specified for the repository
+The following properties provide general information about the repository status and remotes.
 
-`git config --list --show-origin --show-scope` — provides information on user's Git config
+* `git status -b` - Provides information on the current state of the repository.
+* `git remote -v` - Lists the remotes specified for the repository.
+
+#### Configuration {#config-properties}
+
+Git stores configuration at several levels:
+
+* System - Affects the entire Git installation.
+* Global - Affects the current user.
+* Local - Affects a specific repository.
+
+More specific configuration overrides more generic configuration (for example, local overrides global). You can inspect the configuration and see where each value is defined by using the following command:
+
+`git config --list --show-origin --show-scope`
+
+This command shows all active configuration values along with the file and scope they come from.
 
 ### Cannot Create Package from a Revision{#cannot-create-package}