Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alphabetically arranged the MODULES.md file #1167 #1168

Closed
wants to merge 12 commits into from

Conversation

kirito-k
Copy link

@kirito-k kirito-k commented Jul 14, 2019

Fixes #1167

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with npm test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/is-reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@welcome
Copy link

welcome bot commented Jul 14, 2019

Thanks for opening this pull request!
There may be some errors, but don't worry! We're here to help! 👍🎉😄

@codecov
Copy link

codecov bot commented Jul 14, 2019

Codecov Report

Merging #1168 into main will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1168   +/-   ##
=======================================
  Coverage   55.66%   55.66%           
=======================================
  Files         114      114           
  Lines        2357     2357           
  Branches      364      364           
=======================================
  Hits         1312     1312           
  Misses       1045     1045

@aashna27
Copy link

@kirito-k Thank you so much you have done great work! Really helpful.. Welcome to the community and we all would really appreciate more contributions!! 🥂 🎉

@Divy123
Copy link
Member

Divy123 commented Jul 14, 2019

@kirito-k awesome work! 🎉 🎉

Your help is greatly appreciated and looking for more for it in near future and thanks a lot for making the docs a more organised one!!

👍 🎉 🚀

@Divy123
Copy link
Member

Divy123 commented Jul 14, 2019

@jywarren this is ready to be merged!

Copy link
Member

@harshkhandeparkar harshkhandeparkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! I would like to request one more change(if possible). Please try to arrange the actual module docs (not just the table of contents) in alphabetical order.

@aashna27
Copy link

aashna27 commented Jul 14, 2019 via email

@harshkhandeparkar
Copy link
Member

harshkhandeparkar commented Jul 14, 2019 via email

@aashna27
Copy link

aashna27 commented Jul 14, 2019 via email

@jywarren
Copy link
Member

This looks awesome! I'm 👍 alphabetizing in other places too, and we can do this in another PR! Thanks, all, and thanks for the reviews too! Great work, @kirito-k !!! 🎉

@aashna27
Copy link

So i guess the merge is waiting for the conflicts to be resolved. @kirito-k this would be ready to merge as soon as the conflicts are resolved! You will need to update your main and this pr's branch and then see which changes you need to keep as you resolve conflicts.

@aashna27
Copy link

@kirito-k are you facing any issues! I went through the conflicts they are pretty minimal what you have to do is just accept your changes ie the alphabetic changes you have made and then also add to the list the text-overlay list and also accept the text overlay documentation!

@kirito-k
Copy link
Author

@aashna27 Hey. I changed the sequence of all the text below index accordingly. Now do I have to make a new PR or when I changed my own code it automatically got reflected here? Also, I am not able to understand how to resolve conflicts. Do I resolve the conflicts or you do?

@aashna27
Copy link

aashna27 commented Jul 20, 2019 via email

@aashna27
Copy link

aashna27 commented Jul 20, 2019 via email

@aashna27
Copy link

@kirito-k if you are stuck just open a new pr by updating your main and that one can be merged!

@harshkhandeparkar
Copy link
Member

I guess the new PR is here #1186

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alphabetically arrange modules in Module docs
6 participants