merging

• Jan 23, 2023 fossil merging

  Merging binary files in Fossil - to do or not to do?

  This is a note about merging (or not merging) binary files in Fossil.

  Scenario

  Two users Marilyn and Jim update to latest and begin working on their versions of the repository. Marilyn, changes a binary file called DEMO and commits her changes. Meanwhile, Jim changes his DEMO and tries to commit his changes. When he does so, he is warned that a fork would result from his commit.

  Current Situation

  flowchart LR START[ ]-->id1((2))-->id2((3)) id1((2))-..->STOP[ ] style START fill-opacity:0, stroke-opacity:0 style STOP fill-opacity:0, stroke-opacity:0

  In this note, I look at different solutions to the problems arising when two different committers try to commit changes to the same binary file. This is just a note, not a published solution set. It presents my current thinking on the matter and will inevitably evolve as my understanding of Fossil grows.