Hey all, a newbie could use some help.
We have some code that generates data files, and as a part of our build
process those files are rebuilt to ensure things work. This causes an
issue with branches and merging, as the data files change slightly and
dealing with half a dozen merge conflicts, for files that are in an
interim state, is frustrating. The catch is that when the code goes to
the production state, those files must be in place and current.
We use a release branch, and then fork off that for each issue. Testing,
and file creation, is a part of the pre-merge process. This is what
causes the merge conflicts.
Right now my thought is to put the "final" versions of the files in some
other directory, and put the interim file storage directory in
.gitignore. Is there a better way to do this?
Thanks!
Leam
