For a first try I'm quite happy of the way I found to handle comments on my paper draft.
They sent back the annotated pdf, so I extracted the annotations with pdfannots and replaced the bullet points to get an org-mode list with checkboxes. I put both in a new git branch, implemented the requested changes on this branch, and once I have everybody's comments implemented I'll attempt an octopus merge so I can see where they are incompatible instead of replacing one person's comments by the next's.
Rambling about trying to do a manual n-way merge
Apparently some people were wondering the same thing as me 10 years ago but never found anything better either…
Maybe I'm just overcomplicating and it's easier to do a 3-way merge, merging two modified versions at a time with my original as reference.
Or even just one at a time since I still have my original as a commit even if not as a separate branch. Erk, and I though I mostly knew how to use git
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!