In some cases, the merge tool cannot resolve conflicts from multiple
branches at once, leading to the script failing repeatedly regardless of
saved merge conflict resolution, etc. Instead, merging the branches one
by one ensures conflicts can be resolved properly and reduces the
complexity of conflict resolution when multiple conflicts may exist.
This command previously would only work from the root directory of the
repository. This commit updates it to work properly when run for files
deeper in the directory tree.
This ensures that multi-page documents and documents where input is
awaited for a long time before writing use the time the file is written,
as opposed to the time the first page started scanning, in the filename.