I’m trying to merge a new version release of a project I’m working on and used git rebase to do so. One of the files that has conflicts is my .yarn/install-state.gz file. However when I click on it my editor shows a warning on the page that says
The file is not displayed in the text editor because it is either binary or uses an unsupported text encoding.
I click the open anyway button and it shows a bunch of unintelligible characters. If I try to open it in the merge editor I get an error telling me it can’t be opened. How can I resolve the merging issues if this file is unreadable?
2
This file should not be committed.
.yarn/install-state.gzis an optimization file that you shouldn’t ever have to commit.
https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
Resolve the conflict by
-
deleting the file from the index
git rm --cached .yarn/install-state.gz -
adding it to your
.gitignorefor the future, along with the other yarn files mentioned in the FAQs.
2