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

updated contributing.md #210

Merged
merged 2 commits into from
Mar 11, 2021
Merged

updated contributing.md #210

merged 2 commits into from
Mar 11, 2021

Conversation

khareyash05
Copy link
Contributor

@khareyash05 khareyash05 commented Mar 10, 2021

With reference to issue #209

docs: update contributing guide

@gauravdas014
Copy link
Collaborator

@khareyash05 Please refer to commit message formats in the contributing guideline

@gauravdas014
Copy link
Collaborator

gauravdas014 commented Mar 10, 2021

@khareyash05 Do not use too many   for alignment. Align by wrapping the image in HTML tags

@khareyash05
Copy link
Contributor Author

@khareyash05 Please refer to commit message formats in the contributing guideline

Removed Fixes and Added Chore

@khareyash05
Copy link
Contributor Author

@khareyash05 Do not use too many   for alignment. Align by wrapping the image in HTML tags

Sure! I will look into that

@gauravdas014
Copy link
Collaborator

gauravdas014 commented Mar 11, 2021

@khareyash05 Please update the commit message to docs: update contributing guide . It is a standard to use imperative sentences in commit messages. We are following a standard for writing commit messages. Please ask if you still have any doubt.

@khareyash05
Copy link
Contributor Author

khareyash05 commented Mar 11, 2021

Used HTML tag to align image instead of   @gauravdas014 have a look

@gauravdas014
Copy link
Collaborator

Thank you @khareyash05 for all the changes. There is something called squashing commits are you aware of it? It's used for combining two or more commits into a single commit. Please squash the commits.

@khareyash05
Copy link
Contributor Author

@gauravdas014 I am sorry I dont know about it. Could you pls guide me through it

@gauravdas014
Copy link
Collaborator

@gauravdas014 I am sorry I dont know about it. Could you pls guide me through it

Definitely.
Please refer to these resources. Just search for squashing commits and you will find a lot of resources
https://www.git-tower.com/learn/git/faq/git-squash/
https://www.youtube.com/watch?v=V5KrD7CmO4o

@khareyash05
Copy link
Contributor Author

@gauravdas014 will this work ? git rebase -i HEAD~2 as I have 2 commits?

@gauravdas014
Copy link
Collaborator

@gauravdas014 will this work ? git rebase -i HEAD~2 as I have 2 commits?

Yes. The 2 means Head will point to the second last commit. Then you will get the option to delete or edit commits. Delete the wrongly formatted commit message and then you need to force push to your repo. git push -f

@gauravdas014
Copy link
Collaborator

@khareyash05 Please give your PR to the dev branch.

@khareyash05 khareyash05 changed the base branch from master to dev March 11, 2021 03:53
@khareyash05
Copy link
Contributor Author

@gauravdas014 Have a look Am I done with all the changes you wanted

@gauravdas014
Copy link
Collaborator

@gauravdas014 Have a look Am I done with all the changes you wanted

It still showing 2 commits. As it is your first contribution, I can squash from my side also. Would you want me to do that?

@khareyash05
Copy link
Contributor Author

@gauravdas014 I would be highly grateful if you could do the same Thank you very much

@khareyash05
Copy link
Contributor Author

I am actually a bit confused in this ...I will learn this and will squash on my own from the next PR

@gauravdas014
Copy link
Collaborator

@gauravdas014 I would be highly grateful if you could do the same Thank you very much

No problem. Just make sure you learn squashing, it will be useful in the future too. I know I have asked you to make too many changes in your very first pr, but that's how we learn. Open source is all about contributing, learning new things and also following the standards which the repo is maintaining. Good work @khareyash05

@gauravdas014
Copy link
Collaborator

I am actually a bit confused in this ...I will learn this and will squash on my own from the next PR

Definitely, no issue at all. Whenever you need any help feel free to ask. The open-source community is generous enough.

@khareyash05
Copy link
Contributor Author

Thank You @gauravdas014 . Do I have to make any more changes to the same?

@gauravdas014 gauravdas014 merged commit 0fe671f into girlscript:dev Mar 11, 2021
@gauravdas014
Copy link
Collaborator

Thank You @gauravdas014 . Do I have to make any more changes to the same?

No. All changes have been made. Thank you and Good luck with your open source journey.

@khareyash05 khareyash05 deleted the fix#209 branch March 11, 2021 04:17
@khareyash05 khareyash05 restored the fix#209 branch March 11, 2021 04:17
@khareyash05
Copy link
Contributor Author

@gauravdas014 May I know this issue is under which label in GSSOC'21

@gauravdas014
Copy link
Collaborator

Level1

@khareyash05
Copy link
Contributor Author

Level1

Could you please add a GSSOC label to the issue?

@pkspyder007
Copy link
Collaborator

@khareyash05 The issue that corresponds to this PR i.e. #209 already had a gssoc21 label to it. 👍

@khareyash05 khareyash05 deleted the fix#209 branch March 16, 2021 02:10
@khareyash05
Copy link
Contributor Author

@gauravdas014 @pkspyder007 Could you pls add a level label and a GSSOC label to the PR as well because adding a level label to the PR is only being counted
Thanx!

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

Successfully merging this pull request may close these issues.

3 participants