search

hyperledger-archives / education

Hyperledger training material
https://wiki.hyperledger.org/display/LMDWG
Apache License 2.0
372 stars 360 forks source link

Add composer to master #111

Closed alexvicegrab closed 6 years ago

alexvicegrab commented 6 years ago

Requires #112 to resolve conflicts prior to merge

alexvicegrab commented 6 years ago

Tried to fix the signoff issue as well, but the actions suggested:

git checkout add-composer
git rebase HEAD~2 --signoff
git push --force origin add-composer

Don't appear to change anything

alexvicegrab commented 6 years ago

Aha, my bad, wrong version or repository.

Now I get:

git push --force origin add-composer
ERROR: Permission to hyperledger/education.git denied to alexvicegrab.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
tkuhrt commented 6 years ago

Closing in favor of #115. I am not really sure why it did not let me merge master into this branch.