search

ctfs / write-ups-2014

Wiki-like CTF write-ups repository, maintained by the community. 2014
1.83k stars 644 forks source link

Seccon 2014 #346

Closed zachriggle closed 9 years ago

zachriggle commented 9 years ago

Several writeups here https://rzhou.org/~ricky/seccon2014/

the-st0rm commented 9 years ago

Yo Zach Riggle, you fucking spammed our inbox man On Jan 29, 2015 1:45 AM, "Zach Riggle" notifications@github.com wrote:

Several writeups here https://rzhou.org/~ricky/seccon2014/

— Reply to this email directly or view it on GitHub https://github.com/ctfs/write-ups-2014/issues/346.

abpolym commented 9 years ago

@zachriggle Yeah stop using single commits for adding one link. Just add a bunch of links and then commit them once. Everybody gets an email/inbox mail for each pull-request, so that is spam. I told you last time, why don't you listen? I'm going to close your pull-requests, redo that with ONE commit.

mathiasbynens commented 9 years ago

In @zachriggle’s defense, he was probably using the GitHub Web UI, which doesn’t allow multi-file commits or squashing/rebasing AFAIK.

@YASME-Tim After merging a PR and before pushing it, you could also squash the commits using git rebase. That’s how I used to solve this problem. (But you’re right that contributors should take care of this, in a perfect world.)

abpolym commented 9 years ago

@mathiasbynens If it's only possible to do one edit/commit via GitHub Web UI, then he should at least avoid issuing 23 pull-requests for 23 commits. That at least should be possible, even with the UI. Thanks for the git rebase hint. Edit: I've added a simple pull-request in a test repo here as PoC. Steps: 1. Fork the repo. 2. Edit stuff on a new branch in your local repo. 3. Issue pull-request

zachriggle commented 9 years ago

No, it's not possible with the web UI. I don't want to clone an 800MB repo to add a link.

On Thu Jan 29 2015 at 2:08:46 AM polym notifications@github.com wrote:

@mathiasbynens https://github.com/mathiasbynens If it's only possible to do one edit/commit via GitHub Web UI, then he should at least avoid issuing 23 pull-requests for 23 commits. That at least should be possible, even with the UI. Thanks for the git rebase hint.

— Reply to this email directly or view it on GitHub https://github.com/ctfs/write-ups-2014/issues/346#issuecomment-71980153.

abpolym commented 9 years ago

@zachriggle Well you could fork the repo via the web UI and never would have to download it yourself. Git stores it on it's db, you edit in your links via the Web UI into your local, forked repo and in the end you just issue a pull-request. Or where lies the problem in that approach? Edit: You even forked it once already here. If you want to avoid any trouble merging, just delete your local repo and fork it new. It won't cost you any time, since (I think) github forks it quick by storing it on their servers and you don't have to dl a 800 MB repo

zachriggle commented 9 years ago

Ah, yep could do that in the future! Hadn't thought of editing a forked copy in the browser and then creating a PR.

I'll do that from now on. In the meantime, would you mind merging my PRs? It's only one more click to merge them than close them :heart:.

On Thu Jan 29 2015 at 2:32:22 AM polym notifications@github.com wrote:

@zachriggle https://github.com/zachriggle Well you could fork the repo via the web UI and never would have to download it yourself. Git stores it on it's db, you edit in your links via the Web UI into your local, forked repo and in the end you just issue a pull-request. Or where lies the problem in that approach?

— Reply to this email directly or view it on GitHub https://github.com/ctfs/write-ups-2014/issues/346#issuecomment-71982001.

blingblam commented 9 years ago

seriously with this fkin spam dude.... @ZachRiggle

On Thu, Jan 29, 2015 at 3:08 AM, Zach Riggle notifications@github.com wrote:

Ah, yep could do that in the future! Hadn't thought of editing a forked copy in the browser and then creating a PR.

I'll do that from now on. In the meantime, would you mind merging my PRs? It's only one more click to merge them than close them <3.

On Thu Jan 29 2015 at 2:32:22 AM polym notifications@github.com wrote:

@zachriggle https://github.com/zachriggle Well you could fork the repo via the web UI and never would have to download it yourself. Git stores it on it's db, you edit in your links via the Web UI into your local, forked repo and in the end you just issue a pull-request. Or where lies the problem in that approach?

— Reply to this email directly or view it on GitHub https://github.com/ctfs/write-ups-2014/issues/346#issuecomment-71982001.

— Reply to this email directly or view it on GitHub https://github.com/ctfs/write-ups-2014/issues/346#issuecomment-71991534.

zachriggle commented 9 years ago

s/fking spam/contributions to your project with my own free time/ig

abpolym commented 9 years ago

@zachriggle I've merged all pull-requests. Please read/care next time. Thanks :wink: