gitattributes: prevent git automerging glide.lock
gitattributes: prevent git automerging glide.lock

since glide.lock represents the computation of *a set* of mututally compatible versions, it should
not be mechanically merged, but rather just marked conflicted, ideally to be resolved by re-resolving.

sql.go and embedded.go also should not be auto-merged, though that seems unlikely to happen in practice.

glycerine/cockroach,vaibhavarora/cockroach,petermattis/cockroach,paperstreet/cockroach,paperstreet/cockroach,vaibhavarora/cockroach,maxlang/cockroach,petermattis/cockroach,glycerine/cockroach,paperstreet/cockroach,glycerine/cockroach,vaibhavarora/cockroach,maxlang/cockroach,paperstreet/cockroach,paperstreet/cockroach,maxlang/cockroach,maxlang/cockroach,petermattis/cockroach,petermattis/cockroach,vaibhavarora/cockroach,vaibhavarora/cockroach,paperstreet/cockroach,vaibhavarora/cockroach,maxlang/cockroach,petermattis/cockroach,paperstreet/cockroach,glycerine/cockroach,maxlang/cockroach,maxlang/cockroach,paperstreet/cockroach,vaibhavarora/cockroach,vaibhavarora/cockroach,maxlang/cockroach,glycerine/cockroach,petermattis/cockroach,glycerine/cockroach,petermattis/cockroach,glycerine/cockroach,glycerine/cockroach,petermattis/cockroach