Git Product home page Git Product logo

Comments (8)

vbaranov avatar vbaranov commented on July 2, 2024
  • latest commits are moved to poa-dev branch
  • master branch is synced with upstream: 199e7ec

from poa-bridge.

igorbarinov avatar igorbarinov commented on July 2, 2024

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

from poa-bridge.

igorbarinov avatar igorbarinov commented on July 2, 2024

@vbaranov, please sync again

from poa-bridge.

vbaranov avatar vbaranov commented on July 2, 2024

@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?

from poa-bridge.

igorbarinov avatar igorbarinov commented on July 2, 2024

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

from poa-bridge.

vbaranov avatar vbaranov commented on July 2, 2024

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

from poa-bridge.

igorbarinov avatar igorbarinov commented on July 2, 2024

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

from poa-bridge.

vbaranov avatar vbaranov commented on July 2, 2024

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

from poa-bridge.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.