Added a comment

diff --git a/doc/forum/conflict_with_git-crypt/comment_2_cda648fcc5f213af06fe98428910f561._comment b/doc/forum/conflict_with_git-crypt/comment_2_cda648fcc5f213af06fe98428910f561._comment
new file mode 100644 (file)
index 0000000..cf4a401
--- /dev/null
+++ b/doc/forum/conflict_with_git-crypt/comment_2_cda648fcc5f213af06fe98428910f561._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="alt"
+ subject="comment 2"
+ date="2021-12-08T20:01:33Z"
+ content="""
+Thank you for your explanation! 
+
+Removing `* filter=annex` altogether causes problems when the repo has unlocked files, but removing it from `.git/info/attributes` and adding a `.gitattributes` file with the following contents at the repository root seems to allow both git-crypt and git-annex to work without issue:
+
+```
+* filter=annex
+my_secret filter=git-crypt diff=git-crypt
+```
+
+"""]]