search

Consensys / Beyond-Blockchain-Relay

Test Repo
MIT License
20 stars 25 forks source link

BlockSpy #31

Closed craze3 closed 5 years ago

craze3 commented 5 years ago

https://blockspy.net is now live and working! Thank you to ConsenSys and Alethio!

zherring commented 5 years ago

@craze3 I'm getting a merge conflict with your .DS_Store and DeFi/submissions.md. Please resolve in 24 hours.

edsonayllon commented 5 years ago

Wow, this project's great!

.DS_Store is an OS generated file on MacOS. Typically, it's supposed to be ignored inside of .gitignore. If it has been uploaded, you might need to manually remove it, even after adding it to the .gitignore. Most likely, you just need to find that file in your repo and delete it.

Here are a few resources:

Use whichever one makes the most sense to you.

Also, it looks like your project changed the submission.md file for everyone, instead of adding a copy inside the project folder. To fix that, move the submission.md file to inside of your project folder, along with README.md (so it's in your project and not a readme for everyone's projects). And copy and paste the original submission.md file into the DeFi folder.

craze3 commented 5 years ago

Thanks @edsonayllon , should i do it here or can i open a new PR ?

craze3 commented 5 years ago

i removed .DS_Store ... can you try again ?

zherring commented 5 years ago

@craze3 IT still says I have a merge conflict. Could you please open another PR?

zherring commented 5 years ago

Fixed it on my end. Appreciate the patience and thanks for the work @craze3 !