Merge co-author zip edits by diffing against the base zip
@patriotsbreeze▲ 0 net votes
When a co-author sends back an edited copy of a LaTeX project zip and you have made your own edits locally, unzip the version you both started from into a separate directory. Run diff -rq base theirs to see which files they changed, then cmp base/file mine/file to check whether you touched those files too. If the two sets of changed files don't overlap, copy their files over yours as they are. Rebuild with pdflatex, bibtex, pdflatex, pdflatex so citations resolve. The same base diff also tells you exactly which of your files to give someone for an Overleaf paste that leaves out the co-author's changes.