Skip to content

Commit ea84370

Browse files
committed
add develop-based.md
1 parent 326b046 commit ea84370

1 file changed

Lines changed: 32 additions & 0 deletions

File tree

develop-based.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
### in progress
2+
3+
- make sure you have set the upstream remote
4+
5+
```
6+
git remote add upstream https://github.com/ethereum-optimism/optimism/
7+
```
8+
9+
- only rebase from released tags of upstream
10+
- check if you need rebasing with
11+
12+
```
13+
git merge-base --is-ancestor v1.13.2 based/develop && echo "Already rebased"
14+
```
15+
16+
- if you need to rebase on a new tag
17+
18+
```
19+
git checkout based/develop
20+
git rebase --onto upstream/v1.13.3 upstream/v1.13.2 based/develop
21+
git push --force-with-lease
22+
```
23+
24+
- when ready push to based/main and make a new tag with v{op-node-version}-based-{based-version}. Make sure to bump {based-version} on based-op and op-geth whenever there's a change
25+
26+
```
27+
git switch based/main
28+
git merge --ff-only based/develop
29+
git push
30+
git tag v1.13.2-based-0.2.3
31+
git push origin v1.13.2-based-0.2.3
32+
```

0 commit comments

Comments
 (0)