search

anitab-org / vms

THIS PROJECT IS ARCHIVED. Volunteer Management System.
GNU General Public License v2.0
1 stars 4 forks source link

docs: update file Code Of Conduct & all its respective references (#1047) #1069

Closed aniketrb-github closed 3 years ago

aniketrb-github commented 4 years ago

Description

Fixes #1047

Type of Change:

How has this been tested?

Before the Code changes were made: before-1047-fix

After the Code changes were made: after-1047-fix

Checklist:

Code/Quality Assurance Only

aniketrb-github commented 4 years ago

Hello @sanchibansal340, Can you please review this PR for #1047 Thanks

sanchibansal340 commented 4 years ago

@aniketrb-github Instead of adding the code_of_conduct file to docs please add it outside and delete the previous Code of Conduct and you will be done :)

aniketrb-github commented 4 years ago

@aniketrb-github Instead of adding the code_of_conduct file to docs please add it outside and delete the previous Code of Conduct and you will be done :)

Oh Ok. I added it since the description said so. No problem @sanchibansal340. So, I just have to "delete the newly added file from DOCS folder" right? which means I just have to revert that specific commit. And since you said: "add it outside", so the codeOfCoduct file already exists at the root level, which I have corrected as a part of the fix for this issue.

aniketrb-github commented 4 years ago

Due to the issue description, I preferred to keep my commits independent/modular which helped me. I just learned that if all the small commits were clubbed into a single commit, I would have not been able to revert the commit & incorporate the new requirement. So I just have reverted the code commit which was "Adding file: codeOfConduct to DOCS folder". I hope this suffices it @sanchibansal340. Can you please review it once. Thanks. :)

sanchibansal340 commented 4 years ago

@aniketrb-github There are some inconsistencies with the content. Would it be possible to delete the previous code of conduct file and commit the one you added in the docs folder. Thanks. :)

sanchibansal340 commented 4 years ago

Also please make sure you have changed the links in the README and Contributing guidelines which are in the root directory and not the ones in the docs folder.

aniketrb-github commented 4 years ago

@aniketrb-github There are some inconsistencies with the content. Would it be possible to delete the previous code of conduct file and commit the one you added in the docs folder. Thanks. :)

Hi @sanchibansal340, regarding your comment for "inconsistency with content", I have used this CodeOfConduct file as a reference which was mentioned in the issue description. So to ensure no inconsistency of content, I used this difference checker.

And, regarding the 2nd comment, Yes I have updated the links of the files which are present at the root location and not the ones in DOCS folder.

aniketrb-github commented 4 years ago

Hi @sanchibansal340. Can you check my comments and Please l review my PR once. Thanks

sanchibansal340 commented 4 years ago

Will do @aniketrb-github

sanchibansal340 commented 4 years ago

Looks good to me 👍🏼

aniketrb-github commented 3 years ago

hi @sanchibansal340 , when does this PR get merged?

sanchibansal340 commented 3 years ago

@aniketrb-github it will be merged after OSH ends i.e. after September

aniketrb-github commented 3 years ago

@aniketrb-github it will be merged after OSH ends i.e. after September

Okay. @sanchibansal340 so will it be okay if I delete my forked branch? or will the deletion affect the PR merge? Since the PR is created from my forked repo which had a child branch vms-1047 I had forked the develop branch and have solved 2 issues, but now the fork is a stale repo and is trailing with a no. of commits.