[BUG] xlsx merge

[Brilator]

Tested the new xlsx merge feature.
This works fine when changes were committed to different files
I would just suggest to add a note (e.g. "please pull from the remote first") or offer a pull-button in the dialog when the error occurs.

error: failed to push some refs to 'https://git.nfdi4plants.org/brilator/ArcPrototype.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
...

Also, after pulling+merging, I ran into a fatal error, although the merge seemed to have worked.

Successfully rebased and updated refs/heads/main.
git -c core.editor=true rebase --continue
fatal: No rebase in progress?
git status
On branch main
nothing to commit, working tree clean

Merging changes done on the same file worked, but the dialog did not show what was changed.

ARCitect v0.0.44
macOS

[JonasLukasczyk]

Fixed (029fa29)