Several settings should be moved out of the Git repository, otherwise they will also remain as differences compared to the upstream repository:
Configuration/typo3.yml: typo3_org_username
Configuration/vagrant.yml: synced_folders
I suggest to create a new file Configuration/overrides.yml which is not under Git version control. Add Configuration/overrides.yml.template to Git so it can be copied and adjusted easily.
Several settings should be moved out of the Git repository, otherwise they will also remain as differences compared to the upstream repository:
I suggest to create a new file Configuration/overrides.yml which is not under Git version control. Add Configuration/overrides.yml.template to Git so it can be copied and adjusted easily.