Skip to content

Commit c13c125

Browse files
authored
chore: Have the doc publish script configure pulls to merge. (#89)
1 parent 656ad73 commit c13c125

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

scripts/publish-doc.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,7 @@ git commit -m "chore: Updating docs for $doc_name"
4747

4848
# Update the local copy in case there have been any interim changes.
4949
# If this works inconsistently, then additional checks should be done.
50-
git pull --no-edit
50+
51+
git config pull.rebase false # merge
52+
git pull --no-edit # should accept the default message
5153
git push

0 commit comments

Comments
 (0)