We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent bd16d9c commit de6a19bCopy full SHA for de6a19b
.github/workflows/sync-and-rebase-pr-from-fork.yml
@@ -13,6 +13,8 @@ jobs:
13
steps:
14
- name: Checkout repository
15
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
16
+ with:
17
+ fetch-depth: 0
18
19
- name: Setup Git
20
run: |
@@ -44,9 +46,9 @@ jobs:
44
46
git fetch --no-tags contributor +"$headRefName":"$contribHeadRefName"
45
47
48
# Rebase the branch with the latest targeting branch HEAD
- git fetch origin "$baseRefName"
49
git checkout "$contribHeadRefName"
- if ! git rebase origin/"$baseRefName"; then
50
+ git fetch origin "$baseRefName"
51
+ if ! git rebase FETCH_HEAD; then
52
echo "Rebase conflict detected. Please resolve the conflicts and push the changes to your fork. Exiting!"
53
exit 1
54
fi
0 commit comments