search

IIIT-Delhi / byld-website

Static Website for IIIT-Delhi's Software Dev Club Byld
https://iiit-delhi.github.io/byld-website/
8 stars 29 forks source link

Added myself to the list. #58

Closed Aniket-Pradhan closed 6 years ago

Aniket-Pradhan commented 6 years ago

I was not there before. :/

peey commented 6 years ago

Please amend your commit message to look like this : https://github.com/IIIT-Delhi/byld-website/wiki/Contributing#commit-message-guidelines

peey commented 6 years ago

Verified from the mailing list: added on 30th March, 2018

Aniket-Pradhan commented 6 years ago

Updated the commit. ^.^

virresh commented 6 years ago

Probably you missed members.md: ... ?

Aniket-Pradhan commented 6 years ago

Now it seems fine. :P

peey commented 6 years ago

@Aniket-Pradhan nope, that didn't work:

image

It should read that you're just one commit ahead (and not also one commit behind)

Usually we're able to merge without requiring rebase, but the "merge" option here is totally greyed out (even when viresh had approved the PR):

image

We think it's because you sent a PR from your master branch (which is a protected branch) instead of creating a new branch.

If you go to settings > branches on your fork, you'll see something like this: image

Protected branches are restricted in the operations you can do on them from the GitHub UI, which is why I think you have to rebase manually.

Can you try that again? And in future - always send patches from another branch :P

virresh commented 6 years ago

This PR has little hope for now I have never seen an existing PR that could change the from branch

We cannot accept this PR Please create a new one, and make that from another branch Follow these instructions if not clear

Don't hesitate to ask in case you have any doubts Closing this in favor of a new PR from separate branch

Aniket-Pradhan commented 6 years ago

My bad. I had made the changes on the master branch. I'll submit a new PR.

Sorry for this.