Skip to content

Avoiding merge conflicts caused by not gitignoring database #111

@raghubetina

Description

@raghubetina

I've always worried about the tradeoff between:

  • Conceptual clarity of including the sqlite database in the repo and therefore sidestepping the messiness of having to rollback migrations before switching branches / being able to solve data integrity issues by jumping back to previous commits.
  • Merge conflicts caused by data differences in different branches.

Is this a potential solution?

https://stackoverflow.com/questions/15232000/git-ignore-files-during-merge

If so, we should consider including an appropriate .gitattribute file in all projects.

Metadata

Metadata

Labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions