firstdraft / appdev_template

A Rails template for generating homework projects
0 stars 1 forks source link

Add .gitattributes file #154

Open jelaniwoods opened 4 years ago

jelaniwoods commented 4 years ago

Resolves #111

To handle future assignments when students are merging branches, .gitattributes allows us to define "merge strategies" that will let us choose which version of a file to use in the case of a conflict. This PR will define a strategy for the development.sqlite3 file.

Based on https://stackoverflow.com/a/49358531