As our project works on a Bible Module, we’re frequently getting merge conflicts in the XXC book. But the “conflicts” are really problems associated with edits in the original location. Sometimes this parallels a conflict in the original reference location, but other times it seems to simply be a function of when a particular user opened his XXC book and as a result refreshed the text inside of it.
First, my understanding is that the specification itself lives inside the folder XYZ\Modules\
folder, and that that particular *.sfm
file only includes the \ref
lines and anything else that’s been manually entered. Then the XYZ\96XXCXYZ.SFM
files contains the usfm results after the references have been imported. Are both those assumptions correct?
If so, then why is S/R trying to merge the 96XXCXYZ.SFM
file at all? Wouldn’t it be better off trying to merge the original XYZ\Modules\original.sfm
file and all the different Biblical books? For that matter, if there are conflicts when merging XYZ\Modules\original.sfm
, when would that get reported to the users?
[[Note that there is one complication in my personal belief that XYZ\96XXCXYZ.SFM
ought not be merged… that’s true when the XXC book is associated with a Bible Module. But when the book is created all on it’s own (and doesn’t include the module-style markup like \ref
), then normal merging would still need to happen.]]
I’m considering writing up a bug report/feature request, but I’m also wondering if there’s something about the system that I’m simply not understanding.