search

jpsember / golang-base

Jeff's basic Go library
0 stars 0 forks source link

Support actual db vs sim db in git #42

Closed jpsember closed 1 year ago

jpsember commented 1 year ago

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

jpsember commented 1 year ago

When there are no merge conflicts it replaces the database.go file with the other branch's version, which is not what I want.