I typically recommend teams to use .gitattributes for recommended tooling that most team members are encouraged to use. ie the structure merge-driver; rails credentials for filter/smudge; etc
For repositories that already have the merge-structure-sql driver configured in .gitattributes, it is redundant (and potentially confusing to debug) when the local installation still writes to .git/info/attributes.
It would be nice if git-merge-structure-sql --install=local would detect that merge-structure-sql is already registered in .gitattributes (perhaps even checking db/.gitattributes? does git provide a plumbing command for checking this?) and to skip writing .git/info/attributes.
Thanks for the merge-driver; Works great!
I typically recommend teams to use
.gitattributesfor recommended tooling that most team members are encouraged to use. ie the structure merge-driver; rails credentials for filter/smudge; etcFor repositories that already have the
merge-structure-sqldriver configured in.gitattributes, it is redundant (and potentially confusing to debug) when the local installation still writes to .git/info/attributes.It would be nice if
git-merge-structure-sql --install=localwould detect thatmerge-structure-sqlis already registered in.gitattributes(perhaps even checkingdb/.gitattributes? does git provide a plumbing command for checking this?) and to skip writing.git/info/attributes.Thanks for the merge-driver; Works great!