I am just looking through our .gitignore file.
The directories BASE.csharp, REMOTE.csharp, LOCAL.csharp and similar should not exist, please delete them after your merge has finished or you have manually resolved a conflict. These directories are created automatically during merging, and should be deleted after a conflict has been resolved.
They should not exist, therefore I remove them from .gitignore.
directories like /csharp/ICT/Petra/Client/lib/MPartner/gui/_old/*:
I recommend you keep your own files somewhere else, not in the openpetra directory. In case you need to do a clean checkout, you might loose such directories.
I am not sure what /csharp/ICT/PetraTools/GenerateWinForms/YamlEdit/* is, I will keep it there. It proably falls in the same category as _old above.
I have also removed the test files from /XmlReports/Settings/ from the gitignore file. You should just clean up that directory locally, or live with those files.
We should limit the amount of files ignored, otherwise we might suddenly ignore too many files.
If possible, only ignore files, that are created by normal work with the code, and ignore only the files that will most probably exist on other developers machines too.
