Skip to content

O
openzeppelin-contracts-upgradeable
Commit c51637ef by github-actions
Options

Transpile b6861f99

parent d663cb34
Showing with 1 additions and 1 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" origin/patches git switch "$branch" 2>/dev/null || git switch -c "$branch" -t "origin/$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 origin/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