File tree Expand file tree Collapse file tree 2 files changed +24
-4
lines changed Expand file tree Collapse file tree 2 files changed +24
-4
lines changed Original file line number Diff line number Diff line change @@ -108,8 +108,18 @@ jobs:
108
108
BRANCH_NAME : ${{ steps.pr-details.outputs.branch }}
109
109
REPO_NAME : ${{ steps.pr-details.outputs.repository }}
110
110
run : |
111
+ # Configure Git user:
111
112
git config --local user.email "[email protected] "
112
113
git config --local user.name "stdlib-bot"
113
- git fetch origin develop:develop
114
- git merge develop --no-edit
114
+
115
+ # Add upstream remote pointing to the original repository:
116
+ git remote add upstream https://github.com/stdlib-js/stdlib.git
117
+
118
+ # Fetch the develop branch from upstream:
119
+ git fetch upstream develop
120
+
121
+ # Merge upstream develop into the current branch:
122
+ git merge upstream/develop --no-edit
123
+
124
+ # Push the updated branch back to the forked repository:
115
125
git push "https://$USER_NAME:[email protected] /$REPO_NAME.git" $BRANCH_NAME
Original file line number Diff line number Diff line change @@ -108,8 +108,18 @@ jobs:
108
108
BRANCH_NAME : ${{ steps.pr-details.outputs.branch }}
109
109
REPO_NAME : ${{ steps.pr-details.outputs.repository }}
110
110
run : |
111
+ # Configure Git user:
111
112
git config --local user.email "[email protected] "
112
113
git config --local user.name "stdlib-bot"
113
- git fetch origin develop:develop
114
- git rebase develop
114
+
115
+ # Add upstream remote pointing to the original repository:
116
+ git remote add upstream https://github.com/stdlib-js/stdlib.git
117
+
118
+ # Fetch the develop branch from upstream:
119
+ git fetch upstream develop
120
+
121
+ # Rebase current branch onto upstream develop:
122
+ git rebase upstream/develop
123
+
124
+ # Force push the updated branch back to the forked repository:
115
125
git push --force-with-lease "https://$USER_NAME:[email protected] /$REPO_NAME.git" $BRANCH_NAME
You can’t perform that action at this time.
0 commit comments