p-society / p-society.github.io

Official site of p-society (OLD)
https://p-society.herokuapp.com/
MIT License
31 stars 26 forks source link

Main content changes #59

Closed piyushmishra12 closed 5 years ago

piyushmishra12 commented 5 years ago

Changed certain texts in the main content as suggested by @palash25 bhaiya and @shivank01 bhaiya. Please let me know if I have carried out things correctly. I'm still learning.

palash25 commented 5 years ago

@palash25 bhaiya and @shivank01 bhaiya.

no need of bhaiya's just using our github handles doesn't mean that you are being disrespectful. We are all peers I don't want anyone to use bhaiya or didi on github and I am even cool with us being on a first name basis in person too so chill :wink:

Please let me know if I have carried out things correctly

You haven't I am guessing that you checked out this branch from the branch of your 1st PR didn't you?

palash25 commented 5 years ago

I guess that is the reason why this commit is showing up 9002e66710375df78e641b87057f9814d60152f4

You will need to delete this commit and just push the tip of your branch which is currently your second commit.

To avoid this in the future always make a new branch from your master and not any other brach (this creates a copy of the master branch so only one commit would show up in that case)

Also read this please https://github.com/p-society/meta @itsmepiyush2

palash25 commented 5 years ago

were you able to remove your previous commit @itsmepiyush2 ?

piyushmishra12 commented 5 years ago

I'll do it today after class @palash25

piyushmishra12 commented 5 years ago

I tried to revert the commit but I faced the following error.

screen shot 2018-08-20 at 7 17 12 pm
palash25 commented 5 years ago

I am busy right now will answer by tomorrow

knrt10 commented 5 years ago

@itsmepiyush2 closing this PR. Please make new PR with the same changes. Follow these steps after opening your cloned repo of p-soc:- 1) git checkout master 2) git remote add upstream https://github.com/p-society/p-society.github.io.git 3) git fetch upstream 4) git rebase origin/master 5) git checkout -b newBranch(this can be anything you want). Copy old changes to files. 6) git add -A 7) git commit -m "your commit message" 8) git push origin newBranch(branch name from the step 5) Now make a PR comparing your remote to the master of p-society