Commit 49aec36
committed
Remove .gitattributes causing error add_cacheinfo
More info at fabOnReact/react-native-notes#8
facebook#31128 (comment)
>If you want to see how these files are actually stored:
>Remove .gitattributes (so that no conversion happens)
I solved the problem with the following steps:
1) checkout branch I want to rebase
2) the branch was already rebased and included commit facebook@7384471 which brought `.gitattributes` file in the branch
The file below triggers the error `error: add_cacheinfo failed to refresh for path 'packages/react-native-gradle-plugin/gradlew.bat'; merge aborting.` when running `git merge master`.
```
-# Windows files should use crlf line endings
-# https://help.github.com/articles/dealing-with-line-endings/
-*.bat text eol=crlf
```
3) I remove the `.gitattributes` files from the branch.
4) `git` stops converting the line ending
5) I merge main branch. `.gitattributes` files was already removed from main branch with https://github.com/facebook/react-native/pull/31398/files. Git runs the merge without problems. Also no diff because the file already deleted from main.1 parent 55877da commit 49aec36
1 file changed
+0
-3
lines changedThis file was deleted.
0 commit comments