Closed bUnitBot closed 4 months ago
@linkdotnet can you figure out why the rebase works locally on my machine but not here in the pipeline.
This is my output:
❯ git rebase -S main
Successfully rebased and updated refs/heads/v2.
❯ git pull --rebase -S
warning: skipped previously applied commit 9b8c578d
warning: skipped previously applied commit b6ec75de
warning: skipped previously applied commit a80ea037
warning: skipped previously applied commit 406d5b44
warning: skipped previously applied commit 13576053
warning: skipped previously applied commit 5e32a0e1
warning: skipped previously applied commit f639e21c
warning: skipped previously applied commit baceaaaa
warning: skipped previously applied commit 5fa913fe
warning: skipped previously applied commit 6adf0fc9
warning: skipped previously applied commit fde5aaf6
warning: skipped previously applied commit 8076225e
warning: skipped previously applied commit 100d3f95
warning: skipped previously applied commit c8c50805
warning: skipped previously applied commit cd5d8c47
warning: skipped previously applied commit d1298955
warning: skipped previously applied commit bb1a8183
warning: skipped previously applied commit 21f366c5
warning: skipped previously applied commit 165e7019
warning: skipped previously applied commit 967d2a22
warning: skipped previously applied commit b409bcc7
warning: skipped previously applied commit 1280e4d7
warning: skipped previously applied commit 68e51c8c
warning: skipped previously applied commit 12f2316c
warning: skipped previously applied commit de6342a9
warning: skipped previously applied commit 9318a3e5
warning: skipped previously applied commit 5e2a22f4
warning: skipped previously applied commit a8bcbd3e
warning: skipped previously applied commit 459cb7ce
warning: skipped previously applied commit 6a138075
warning: skipped previously applied commit 5dac6e51
warning: skipped previously applied commit 7fe24de0
warning: skipped previously applied commit 4cc9f113
warning: skipped previously applied commit fce6db5c
warning: skipped previously applied commit 8f37c481
warning: skipped previously applied commit ccb64bd0
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/v2.
These are the git commands:
git fetch --all
git checkout v2
git rebase -S origin/main
git push --force-with-lease
this is the workflows output:
Switched to a new branch 'v2'
branch 'v2' set up to track 'origin/v2'.
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging LICENSE
CONFLICT (add/add): Merge conflict in LICENSE
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Rebasing (1/2044)
error: could not apply 40e29581... Initial commit
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 40e29581... Initial commit
@linkdotnet can you figure out why the rebase works locally on my machine but not here in the pipeline.
This is my output:
❯ git rebase -S main Successfully rebased and updated refs/heads/v2. ❯ git pull --rebase -S warning: skipped previously applied commit 9b8c578d warning: skipped previously applied commit b6ec75de warning: skipped previously applied commit a80ea037 warning: skipped previously applied commit 406d5b44 warning: skipped previously applied commit 13576053 warning: skipped previously applied commit 5e32a0e1 warning: skipped previously applied commit f639e21c warning: skipped previously applied commit baceaaaa warning: skipped previously applied commit 5fa913fe warning: skipped previously applied commit 6adf0fc9 warning: skipped previously applied commit fde5aaf6 warning: skipped previously applied commit 8076225e warning: skipped previously applied commit 100d3f95 warning: skipped previously applied commit c8c50805 warning: skipped previously applied commit cd5d8c47 warning: skipped previously applied commit d1298955 warning: skipped previously applied commit bb1a8183 warning: skipped previously applied commit 21f366c5 warning: skipped previously applied commit 165e7019 warning: skipped previously applied commit 967d2a22 warning: skipped previously applied commit b409bcc7 warning: skipped previously applied commit 1280e4d7 warning: skipped previously applied commit 68e51c8c warning: skipped previously applied commit 12f2316c warning: skipped previously applied commit de6342a9 warning: skipped previously applied commit 9318a3e5 warning: skipped previously applied commit 5e2a22f4 warning: skipped previously applied commit a8bcbd3e warning: skipped previously applied commit 459cb7ce warning: skipped previously applied commit 6a138075 warning: skipped previously applied commit 5dac6e51 warning: skipped previously applied commit 7fe24de0 warning: skipped previously applied commit 4cc9f113 warning: skipped previously applied commit fce6db5c warning: skipped previously applied commit 8f37c481 warning: skipped previously applied commit ccb64bd0 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Successfully rebased and updated refs/heads/v2.
These are the git commands:
git fetch --all git checkout v2 git rebase -S origin/main git push --force-with-lease
this is the workflows output:
Switched to a new branch 'v2' branch 'v2' set up to track 'origin/v2'. Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging LICENSE CONFLICT (add/add): Merge conflict in LICENSE Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Rebasing (1/2044) error: could not apply 40e29581... Initial commit hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 40e29581... Initial commit
My best guess is that @actions/checkout only does a shallow clone.
My best guess is that @actions/checkout only does a shallow clone
Good point. I'll see how I can toggle that and try again 😊
This PR is created automatically by the bUnit bot.
When completing this PR, it's important to use Rebase and merge to keep the commit history clean.