-
Notifications
You must be signed in to change notification settings - Fork 209
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
Conversation
Thanks for opening this pull request! |
Codecov Report
@@ Coverage Diff @@
## main #1168 +/- ##
=======================================
Coverage 55.66% 55.66%
=======================================
Files 114 114
Lines 2357 2357
Branches 364 364
=======================================
Hits 1312 1312
Misses 1045 1045 |
@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!! 🥂 🎉 |
@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!! 👍 🎉 🚀 |
@jywarren this is ready to be merged! |
There was a problem hiding this 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.
Harsh we can also leave them like that as they do link to the docs! What do
you think?
…On Sun, Jul 14, 2019, 10:24 PM Harsh Khandeparkar ***@***.***> wrote:
***@***.**** requested changes on this pull request.
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.
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#1168?email_source=notifications&email_token=AGKQ7SFZYWEL5W23BSEVE4DP7NK35A5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB6LY6MA#pullrequestreview-261590832>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AGKQ7SEQEXBDU5D3LJRESWLP7NK35ANCNFSM4IDE77EQ>
.
|
It is always better if we alphabetically arrange it. Isn't it so? It looks
better and properly formatted.
…On Sun, 14 Jul, 2019, 10:40 PM aashna27, ***@***.***> wrote:
Harsh we can also leave them like that as they do link to the docs! What do
you think?
On Sun, Jul 14, 2019, 10:24 PM Harsh Khandeparkar <
***@***.***>
wrote:
> ***@***.**** requested changes on this pull request.
>
> 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.
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
> <
#1168?email_source=notifications&email_token=AGKQ7SFZYWEL5W23BSEVE4DP7NK35A5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB6LY6MA#pullrequestreview-261590832
>,
> or mute the thread
> <
https://github.com/notifications/unsubscribe-auth/AGKQ7SEQEXBDU5D3LJRESWLP7NK35ANCNFSM4IDE77EQ
>
> .
>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1168?email_source=notifications&email_token=AIJI5H3F2QEQFACWO75GN53P7NMZLA5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZ4JOWY#issuecomment-511219547>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AIJI5H7FGF3NVEURQ2AUMSLP7NMZLANCNFSM4IDE77EQ>
.
|
Yeah great then!
On Sun, Jul 14, 2019, 10:43 PM Harsh Khandeparkar <notifications@github.com>
wrote:
… It is always better if we alphabetically arrange it. Isn't it so? It looks
better and properly formatted.
On Sun, 14 Jul, 2019, 10:40 PM aashna27, ***@***.***> wrote:
> Harsh we can also leave them like that as they do link to the docs! What
do
> you think?
>
> On Sun, Jul 14, 2019, 10:24 PM Harsh Khandeparkar <
> ***@***.***>
> wrote:
>
> > ***@***.**** requested changes on this pull request.
> >
> > 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.
> >
> > —
> > You are receiving this because you commented.
> > Reply to this email directly, view it on GitHub
> > <
>
#1168?email_source=notifications&email_token=AGKQ7SFZYWEL5W23BSEVE4DP7NK35A5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB6LY6MA#pullrequestreview-261590832
> >,
> > or mute the thread
> > <
>
https://github.com/notifications/unsubscribe-auth/AGKQ7SEQEXBDU5D3LJRESWLP7NK35ANCNFSM4IDE77EQ
> >
> > .
> >
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <
#1168?email_source=notifications&email_token=AIJI5H3F2QEQFACWO75GN53P7NMZLA5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZ4JOWY#issuecomment-511219547
>,
> or mute the thread
> <
https://github.com/notifications/unsubscribe-auth/AIJI5H7FGF3NVEURQ2AUMSLP7NMZLANCNFSM4IDE77EQ
>
> .
>
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#1168?email_source=notifications&email_token=AGKQ7SEOBO3XLXNLW243DS3P7NNB7A5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZ4JQLY#issuecomment-511219759>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AGKQ7SEQ44VSUP5BNRET3NDP7NNB7ANCNFSM4IDE77EQ>
.
|
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 !!! 🎉 |
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. |
@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! |
@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? |
The changes you made locally need to be pushed to your brach.
…On Sun, Jul 21, 2019, 12:44 AM Devavrat Kalam ***@***.***> wrote:
@aashna27 <https://github.com/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?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1168?email_source=notifications&email_token=AGKQ7SCUYE5W6ICCMMRZRODQANPZXA5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2NUKIA#issuecomment-513492256>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AGKQ7SCPLBGGQ5V37OGC26LQANPZXANCNFSM4IDE77EQ>
.
|
So the procedure I follow for resolving conflicts is, to first checkout to
main branch and update it, using fetch upstream.
Then you switch to your branch and do git rebase -i upstream/main
This will show the conflicting files and then you resolve the conflicts
locally in editor and push it again to branch.
On Sun, Jul 21, 2019, 1:16 AM Aashna Mittal <aashna.mittal27@gmail.com>
wrote:
… The changes you made locally need to be pushed to your brach.
On Sun, Jul 21, 2019, 12:44 AM Devavrat Kalam ***@***.***>
wrote:
> @aashna27 <https://github.com/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?
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#1168?email_source=notifications&email_token=AGKQ7SCUYE5W6ICCMMRZRODQANPZXA5CNFSM4IDE77E2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2NUKIA#issuecomment-513492256>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AGKQ7SCPLBGGQ5V37OGC26LQANPZXANCNFSM4IDE77EQ>
> .
>
|
@kirito-k if you are stuck just open a new pr by updating your main and that one can be merged! |
I guess the new PR is here #1186 |
Fixes #1167
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
npm test
@publiclab/is-reviewers
for help, in a comment belowIf 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!