search

Sudha247 / ocaml-joy

MIT License
22 stars 14 forks source link

Feature: Created grid of circles using joy.shape #41

Closed TitilayoAdeyemi closed 10 months ago

TitilayoAdeyemi commented 11 months ago

Worked on creating a grid of four circles usnig Joy.shape Screenshot (116)

TitilayoAdeyemi commented 11 months ago

Thank you so much @Sudha247, I have fixed the merge conflicts. I'd be expecting reviews.

nikochiko commented 11 months ago

@TitilayoAdeyemi Thanks for the PR!

Can you please run dune fmt on your code once?

You might also need to run opam install ocamlformat before that.

TitilayoAdeyemi commented 11 months ago

Hi @nikochiko. Thank you so much, I have done that. I initially didn't know what dune fmt was meant for, but I looked it up and I understand now. Is there anything else I need to do now?

TitilayoAdeyemi commented 11 months ago

Hello @nikochiko, hi @Sudha247. Would like to know if the code is okay now?

nikochiko commented 11 months ago

@TitilayoAdeyemi my bad -- i didn't realise that there would be a lot of other changes and it would be difficult to review it with that. i have reverted those changes now -- you should git pull on your local machine before your next changes.

TitilayoAdeyemi commented 10 months ago

Hello @nikochiko For some reason, I haven't been able to create a pull request. I have corrected the code and pushed but I can't find any option to compare and create a pull request

nikochiko commented 10 months ago

@TitilayoAdeyemi i think the reason you're having trouble doing it is because you made changes on your main branch.

When making new changes, you are supposed to create a new branch from main.

This might help: https://www.freecodecamp.org/news/a-simple-git-guide-and-cheat-sheet-for-open-source-contributors/

TitilayoAdeyemi commented 10 months ago

HI @nikochiko thank you very much for the contribution guide. I have discovered where I made an error. I had actually created another branch, I called it "remote". I pushed my code from there but still wasn't able to create a pull request. In the quest for finding solutions on google, I merged my remote to my main, apparently, that did not work. Both my branches (main and remote) are updated but I can't create a pull request. How do I resolve this? Thank you!