From 8bfc96e1aa7f82bcde2b0eeceb17d4703a7cd47a Mon Sep 17 00:00:00 2001 From: bitbonk Date: Fri, 8 May 2020 11:18:42 +0200 Subject: [PATCH 1/2] ignore projectSettingsUpdater.xml from Rider --- Global/JetBrains.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 8da0824b..f3b15048 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -10,6 +10,7 @@ # Generated files .idea/**/contentModel.xml +.idea/**/projectSettingsUpdater.xml # Sensitive or high-churn files .idea/**/dataSources/ From 5cca9928eb094e1c47a6177c5f6756926741c522 Mon Sep 17 00:00:00 2001 From: bitbonk Date: Fri, 8 May 2020 14:28:27 +0200 Subject: [PATCH 2/2] Move projectSettingsUpdater.xml to Rider section Also simplify it, recursive exclusion is not necessary --- Global/JetBrains.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index f3b15048..3ae4cf6f 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -10,7 +10,6 @@ # Generated files .idea/**/contentModel.xml -.idea/**/projectSettingsUpdater.xml # Sensitive or high-churn files .idea/**/dataSources/ @@ -70,3 +69,6 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser + +#Rider +.idea/*/.idea/projectSettingsUpdater.xml