search

SIGBlockchain / project_aurum

SIG Blockchain blockchain project in Go
https://acm.cs.uic.edu/sigblockchain
MIT License
7 stars 1 forks source link

Endpoints #352

Closed harshalpatel165 closed 4 years ago

harshalpatel165 commented 4 years ago

added constant for in endpoint for incoming blocks

kastolars commented 4 years ago

So the problem here is you made a branch based off of json_test, and not dev

You need to make a branch based off of dev, make your changes, then push, then make a PR from that dev-based branch.

harshalpatel165 commented 4 years ago

ok, I wasnt able to checkout from dev before(says I didnt permissions or something), but now that I created the endpoint branch, I can checkout to dev. So now that im on the dev branch, do I just create a new branch called endpoint or whatever.

kastolars commented 4 years ago

You weren't able to checkout dev before because you had uncommitted changes. For future reference, a dirty trick is to run git stash, which will remove the changes that are uncommitted and cache them so that you can call git stash pop on in a different branch.

If you are able to checkout the dev branch now, follow the original sequence of steps I showed in the other PR, add your changes, push, and make a PR from that new branch.

harshalpatel165 commented 4 years ago

you want me to make a pull request from the new branch to which branch? back to dev im assuming?

kastolars commented 4 years ago

you want me to make a pull request from the new branch to which branch? back to dev im assuming?

Just make a separate PR.

harshalpatel165 commented 4 years ago

so whats the base branch, and the compare branch is the new branch that I make?

kastolars commented 4 years ago

It should be dev < yourNewBranch

harshalpatel165 commented 4 years ago

ok thats what it shows for this one

kastolars commented 4 years ago

Yeah you need to make a new branch based off dev. The endpoints branch you have here is based on json_test.