hint: hint: git branch -m <name>' 2023-05-09T13:35:58Z INFO git.cmd: git fetch -n /var/lib/git/operations/puppet production:oot-rebase/production c9d8c5697fae8624356f120ccc136fc36d3621f7:oot-rebase/upstream -> 0; stdout: '<OUTPUT_STREAM>'; stderr: 'From /var/lib/git/operations/puppet * [new branch] production -> oot-rebase/production * [new ref] c9d8c5697fae8624356f120ccc136fc36d3621f7 -> oot-rebase/upstream' 2023-05-09T13:35:59Z INFO git.cmd: git checkout oot-rebase/production -> 0; stdout: '<OUTPUT_STREAM>'; stderr: 'Switched to branch 'oot-rebase/production'' 2023-05-09T13:35:59Z INFO git.cmd: git rebase --preserve-merges --stat --strategy=recursive --strategy-option=patience oot-rebase/upstream -> 128; stdout: '<OUTPUT_STREAM>'; stderr: 'fatal: --preserve-merges was replaced by --rebase-merges' 2023-05-09T13:35:59Z ERROR sync-upstream: Rebase failed!
Description
Description
Details
Details
Event Timeline
Comment Actions
Change 917888 had a related patch set uploaded (by Andrew Bogott; author: Andrew Bogott):
[operations/puppet@production] git-sync-upstream: use --rebase-merges instead of --preserve-merges
Comment Actions
Change 917888 merged by Andrew Bogott:
[operations/puppet@production] git-sync-upstream: use --rebase-merges instead of --preserve-merges
Comment Actions
That patch gets us the much-more-helpful
fatal: error: cannot combine '--rebase-merges' with '--strategy-option'
Comment Actions
Change 917896 had a related patch set uploaded (by Andrew Bogott; author: Andrew Bogott):
[operations/puppet@production] git-sync-upstream.py: remove --rebase-merges git flag
Comment Actions
Change 917896 merged by Andrew Bogott:
[operations/puppet@production] git-sync-upstream.py: remove --rebase-merges git flag