aborrero@cloudinfra-internal-puppetmaster-01:~$ sudo git-sync-upstream
[...]
First, rewinding head to replay your work on top of it...
Auto-merging modules/profile/manifests/wmcs/novaproxy.pp
Auto-merging modules/dynamicproxy/manifests/api.pp
Auto-merging modules/dynamicproxy/files/api/schema.sql
CONFLICT (add/add): Merge conflict in modules/dynamicproxy/files/api/schema.sql
Auto-merging modules/dynamicproxy/files/api/invisible-unicorn.py
CONFLICT (content): Merge conflict in modules/dynamicproxy/files/api/invisible-unicorn.py'; stderr: '
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
'
2023-10-02T15:36:16Z ERROR    sync-upstream: Rebase failed!