As a workaround I deleted the four files before committing, then re-added them and committed again since the history on these particular files isn't really important. But for future reference I'd like to know how to avoid this in the first place and, if it should happen, how to resolve it.
On Thu, 9 May 2019 at 09:30, Michael Richter <ttmrich...@gmail.com> wrote: > New_Version: > 0d481726efdeaf7e1e425da5db82af9042217eaa59ca689e3a253cefdbb93a77 > ERROR: [CPU/STM32F103RC_buildnumber] is different on disk compared to the > repository > NOTICE: Repository version of [CPU/STM32F103RC_buildnumber] stored in > [file-61e47e1f48a9c5ea] > ERROR: [CPU/STM32L051C8_buildnumber] is different on disk compared to the > repository > NOTICE: Repository version of [CPU/STM32L051C8_buildnumber] stored in > [file-a6f36ff4f651070e] > ERROR: [CPU/STM32L071RB_buildnumber] is different on disk compared to the > repository > NOTICE: Repository version of [CPU/STM32L071RB_buildnumber] stored in > [file-4d2773b552c88285] > > I can't make heads or tails of this, making it difficult for me to find a > solution. Could some kind soul please translate this? > > -- > "Perhaps people don't believe this, but throughout all of the discussions > of entering China our focus has really been what's best for the Chinese > people. It's not been about our revenue or profit or whatnot." > --Sergey Brin, demonstrating the emptiness of the "don't be evil" mantra. > -- "Perhaps people don't believe this, but throughout all of the discussions of entering China our focus has really been what's best for the Chinese people. It's not been about our revenue or profit or whatnot." --Sergey Brin, demonstrating the emptiness of the "don't be evil" mantra.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
