Right way of tracking a sqlite3 binary file in git?

后端 未结 2 1841
猫巷女王i
猫巷女王i 2020-12-17 19:36

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

2条回答
  •  别那么骄傲
    2020-12-17 20:21

    You could define a custom merge driver specifying to always "keep theirs" (copy the version you are pulling) on top of your current version.

    .gitattributes
    
    mysqlite3.db merge=keepTheir
    

    (That being said, remember binaries aren't always best managed with Git, especially if they are modified often)

提交回复
热议问题