Even simpler: Step 1: give me your edited `.tex` file. Step 2: I selectively merge it into mine. Step 3: There is no step 3. To selectively merge, I use `me

Even simpler: Step 1: give me your edited `.tex` file. Step 2: I selectively merge it into mine. Step 3: There is no step 3. To selectively merge, I use `meld` https://meldmerge.org/ https://meldmerge.org/ but there are others. Benefits of this even simpler approach: - We continue to use the tools we are used to. - We and our software don't have to learn a new inline diff format. - Both files retain valid syntax before and during the selective merge. - I can choose chunks to accept with a simple mouse click instead of editing a diff chunk.