(Fix) Sync with upstream

omni / poa-bridge

POA <-> Ethereum bridge for self transfers of POA native token to POA20 (ERC20 representation). Not supported. Use TokenBridge instead

https://github.com/poanetwork/token-bridge

GNU General Public License v3.0

80 stars 38 forks source link

(Fix) Sync with upstream #2

Closed igorbarinov closed 6 years ago

igorbarinov commented 6 years ago

Problem:

our temp changes are in master branch and it's hard to sync with parity Solution:
move commits from master to your branch
sync with upstream

vbaranov commented 6 years ago

latest commits are moved to poa-dev branch
master branch is synced with upstream: https://github.com/poanetwork/parity-bridge/commit/199e7ec271a94d5ba41fcfebbd1d1f6839922263

igorbarinov commented 6 years ago

it shows that master is ahead.. https://help.github.com/articles/syncing-a-fork/

igorbarinov commented 6 years ago

@vbaranov, please sync again

vbaranov commented 6 years ago

@igorbarinov

screen shot 2018-01-20 at 21 26 12

screen shot 2018-01-20 at 21 34 13

I've already synced it with paritytech/parity-bridge.git master branch. These 53 commits - it is our support of ERC-20 token at the right side and javascript tests of the contracts with some sample setups. Don't you want to track our changes in master branch? Could you clarify?

igorbarinov commented 6 years ago

Let's have our changes in a separate branch. Master branch we need to have in full sync with upstream.

vbaranov commented 6 years ago

Ok. Master branch is fully synced with upstream now. Our changes are in other branches.

igorbarinov commented 6 years ago

What is difference between poa-dev and poa-dev2 branches?

vbaranov commented 6 years ago

poa-dev - is dev branch tested successfully with our demos, not merged with upstream poa-dev2 is dev branch with upstream, not tested yet