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

Edited contents in Palash Nigam's profile #58

Merged
merged 1 commit into from
Aug 19, 2018

Conversation

piyushmishra12
Copy link
Member

No description provided.

Copy link
Member

@knrt10 knrt10 left a comment

Choose a reason for hiding this comment

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

@itsmepiyush2 please make the following changes rest @palash25 with review.


BUNDLED WITH
1.16.2
1.16.3
Copy link
Member

Choose a reason for hiding this comment

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

@itsmepiyush2 please change it back to 1.16.2 and also don't change anything in this file

@piyushmishra12
Copy link
Member Author

piyushmishra12 commented Aug 18, 2018

@knrt10 Sorry I'm still a newbie on GitHub. I did not understand what you said. Can you please elaborate so that I can make necessary changes?

@knrt10
Copy link
Member

knrt10 commented Aug 18, 2018

@itsmepiyush2 please follow these steps:-

  1. git checkout master
  2. git branch -D Changes
  3. git remote add upstream https://github.com/p-society/p-society.github.io.git
  4. git rebase upstream/master
  5. git checkout -b changes
  6. Copy changes for github on 2 files you made
  7. git add -A
  8. git commit -m "commit message you want"
  9. git push origin master

@knrt10
Copy link
Member

knrt10 commented Aug 18, 2018

After that make a new PR

@palash25
Copy link
Contributor

After that make a new PR

why do you want a new PR ? @knrt10 can't he just amend the commit ? I want @itsmepiyush2 to learn amend and force push

@palash25
Copy link
Contributor

Just to make things clear @knrt10 we will always amend commits don't let the juniors take the easy way out 😜 if we train them well here and be strict with our reviews it will be easier for them to contribute to major OSS organizations.

Copy link
Contributor

@palash25 palash25 left a comment

Choose a reason for hiding this comment

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

@knrt10 what about this binary file .DS_Store it seems to be autogenerated do we need it here?


- I also like to write articles and have written for opensource.com and geeksforgeeks.org in the past. I also maintain a list of links to all my articles just in case you are interested.
- Most of my time is spent hacking on open source. I have made contributions to coala, duckduckgo, Kinto, OpenGenus, Mozilla and the Ethereum foundation. Moreover, I am fond of writing articles. I have prior experience in content writing for opensource.com and geeksforgeeks.org. For those interested, I maintain a list of links to all my articles.
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add this as a link to the last word of this point i.e [articles](https://github.com/palash25/articles/) ?

Copy link
Contributor

Choose a reason for hiding this comment

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

The rest LGTM 👍

Copy link
Member Author

Choose a reason for hiding this comment

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

Could you tell me what the "remote name" is? I'll do a force push.

Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please google that first and then ask me if you still don't understand?

Copy link
Member Author

Choose a reason for hiding this comment

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

I actually did. I couldn't understand so I asked. Sorry.

Copy link
Contributor

Choose a reason for hiding this comment

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

remote_name is the name given to the repository url. Do git remote -v and tell me what you see.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

that means origin is your remote name. You will also need to add an upstream remote but we can do that after this PR. The upstream will point to this repo i.e. p-society/p-society.githu.....

@knrt10 knrt10 merged commit e39d43f into p-society:master Aug 19, 2018
@palash25
Copy link
Contributor

@knrt10 this wasn't supposed to be merged yet please read the ongoing conversations before merging stuff. Now if I revert this it shows a that I have authored the commit. How do you plan to fix this?

I had also asked @itsmepiyush2 to force push #58 (comment) how is he supposed to do that now?

@palash25
Copy link
Contributor

palash25 commented Aug 19, 2018

@knrt10 I need you to fix this mess

You should be more careful @knrt10 while reviewing. You didn't even realize that @itsmepiyush2 hasn't pushed the suggested changes yet and the current state of the PR doesn't even address your own review comments.

I guess you are drunk with power 😜 since you have had sole control over this repo since the beginning from now on we should require at least 2 approvals before merging any PRs.

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.

None yet

3 participants