Closed pauladkisson closed 1 year ago
Ahh
One impact of your frozen dependency idea will inevitably be the merge conflicts that result - though I suppose in all cases you would delegate to the changes induced by the local branch?
One impact of your frozen dependency idea will inevitably be the merge conflicts that result - though I suppose in all cases you would delegate to the changes induced by the local branch?
Hmm, yeah merge conflicts are a bit annoying...
I don't really care about what happens to frozen_dependencies.txt
on merge bc it's primarily for provenance: linking the environment to each commit. When I go back and checkout a past commit, I only need the dependencies to accurately reflect the run environment for that commit -- they don't need to persist across branches during the course of development. With that in mind, maybe we could just delete frozen_dependencies.txt
on merge to avoid conflicts?
Fixes #49