I maintain a fork of a repo.
That repo which has been tracking a binary file (which is a sqlite3 file).
Every time I pull from that repo, I experience merge conflict due to that binary file.
What is the right way to solve this kind of merge conflict?
What is the right way to manage binary files (like this sqlite3 *.db file) in git?
See Question&Answers more detail:
os 与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…