[fossil-users] Find and fix text files committed as binary files

Hi, I use a locally modified version of fossil, where customizations are in a separate branch. I often merge from trunk to get latest updates. This time when I tried to merge, I got 4 conflicts indicating binary files: $ fossil merge trunk ... MERGE src/clone.c * Cannot merge binary file

Re: [fossil-users] Find and fix text files committed as binary files

2014-04-14 11:20 GMT+02:00 Urmil Parikh urmilpar...@gmail.com: I assume last time when I merged and committed these files, they got committed as binary files. How do I find cause of them considered as binary and how do I fix them so that I can merge without any issues? There are only three

Re: [fossil-users] Find and fix text files committed as binary files

Thanks, Jan for hints! I did a forced commit after removing binary-glob and now I;m able to merge without conflicts. On Mon, Apr 14, 2014 at 3:30 PM, Jan Nijtmans jan.nijtm...@gmail.comwrote: 2014-04-14 11:20 GMT+02:00 Urmil Parikh urmilpar...@gmail.com: I assume last time when I merged and