Skip to content

O
openzeppelin-contracts-upgradeable
Commit 61dee6d3 by github-actions
Options

Merge upstream master into patched/master

parents a229a9e8 52826019
Showing with 2 additions and 2 deletions
scripts/upgradeable/merge-upstream.sh
...@@ -17,6 +17,6 @@ input="${REF#refs/heads/}" ...@@ -17,6 +17,6 @@ input="${REF#refs/heads/}"
upstream="${input#patched/}" upstream="${input#patched/}"
branch="patched/$upstream" branch="patched/$upstream"
git checkout "$branch" 2>/dev/null || git checkout -b "$branch" patches git checkout "$branch" 2>/dev/null || git checkout -b "$branch" origin/patches
git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git' "$upstream" git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git' "$upstream"
git merge patches FETCH_HEAD -m "Merge upstream $upstream into $branch" git merge origin/patches FETCH_HEAD -m "Merge upstream $upstream into $branch"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment