From 266c134a9efed2ae5db198ec464a0aca7ffcf4ec Mon Sep 17 00:00:00 2001 From: Michael Bemmerl Date: Sat, 28 May 2011 00:40:54 +0200 Subject: [PATCH 1/2] ReSharper is a add-in which works in Visual Studio only. It's already in the VisualStudio gitignore file. --- CSharp.gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/CSharp.gitignore b/CSharp.gitignore index d6ead5dd..9ac0ec3d 100644 --- a/CSharp.gitignore +++ b/CSharp.gitignore @@ -1,6 +1,3 @@ -# ReSharper meta directory -_ReSharper* - # Build Folders (you can keep bin if you'd like, to store dlls and pdbs) bin obj From e6117c95dc86aa0d8935862a4d70414be588c48f Mon Sep 17 00:00:00 2001 From: Michael Bemmerl Date: Sat, 28 May 2011 00:47:21 +0200 Subject: [PATCH 2/2] Ignore multiple backup directories & logfiles from vsual studio's project conversion. It is possible to run the project converter multiple times, which would generate new backup-directories (Backup1-Backupn) and logfiles (UpgradeLog2.XML-UpgradeLogn.XML) --- Global/VisualStudio.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Global/VisualStudio.gitignore b/Global/VisualStudio.gitignore index 04ba113b..f12b4b9f 100644 --- a/Global/VisualStudio.gitignore +++ b/Global/VisualStudio.gitignore @@ -68,5 +68,5 @@ Generated_Code #added for RIA/Silverlight projects # Backup & report files from converting an old project file to a newer # Visual Studio version. Backup files are not needed, because we have git ;-) _UpgradeReport_Files/ -Backup/ -UpgradeLog.XML +Backup*/ +UpgradeLog*.XML