search

babylonchain / simple-staking

Simple staking application
Other
2 stars 5 forks source link

merge main into dev #298

Closed jrwbabylonchain closed 4 days ago

jeremy-babylonchain commented 1 week ago

some tests failed after rebasing

vitsalis commented 1 week ago

Why did we rebase? We should keep exactly the same commits. Now the commit in this PR is different than the one on main. If there are conflicts, we need to create an additional commit that resolves them while keeping the original commit the same.

jeremy-babylonchain commented 1 week ago

Why did we rebase? We should keep exactly the same commits. Now the commit in this PR is different than the one on main. If there are conflicts, we need to create an additional commit that resolves them while keeping the original commit the same.

Ive reset the rebasing, will let @jrwbabylonchain deal with the conflicts

jrwbabylonchain commented 4 days ago

Why did we rebase? We should keep exactly the same commits. Now the commit in this PR is different than the one on main. If there are conflicts, we need to create an additional commit that resolves them while keeping the original commit the same.

Ive reset the rebasing, will let @jrwbabylonchain deal with the conflicts

no worries. I will resolve all conflicts across both FE repos today

jrwbabylonchain commented 4 days ago

i will start with a new branch/PR

jrwbabylonchain commented 4 days ago

https://github.com/babylonchain/simple-staking/pull/301