On 7/28/2015 5:50 PM, Christopher M. Fuhrman wrote: > On Tue, 28 Jul 2015 at 3:43pm, Paolo Bolzoni wrote: >> The .pdf is actually a binary output of other files, so it should be >> ignored during merge conflicts. I know this violated the basics of a >> scm, but it is possible to tell the repository to treat some file >> differently and do not try to merge them, but simply replace? > > I believe doing this: > $ fossil settings binary-glob "*.pdf" > would work. Probably better to do it from the web ui in case there are > other values present in that setting.
I recommend adding *.pdf as a line to a checked-in file named ".fossil-settings/binary-glob". This way the setting itself is versioned and distributed to repository clones upon sync/update. -- Andy Goth | <andrew.m.goth/at/gmail/dot/com>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
