Use diff3 format for merge conflists (show the common ancestor).
Include vera's sensor explicitly.
gitignore everything not already added to the repo.