search

brooklynjs / brooklynjs.github.io

The world's most popular programming language, in New York's most popular borough
http://brooklynjs.com
BSD 2-Clause "Simplified" License
198 stars 240 forks source link

change PR workflow to prevent merge conflicts #141

Closed jed closed 7 years ago

jed commented 9 years ago

currently, merge conflicts for the index.html page are really annoying, since speakers will end up vying for the same slot.

we should have a system where instead of editing a five locations in a single file, all new PRs rename an existing file and edit it as needed. this file could even be JSON so that the front page could read it in in the browser without a build process.

brianloveswords commented 9 years ago

Thanks for your proposal! Unfortunately we're full this month, but we'd love to hear this talk next month.

brianloveswords commented 9 years ago

j/k lol

jed commented 9 years ago

You certainly are full... OF SOMETHING.

jalcine commented 9 years ago

How about Gitflow sans the lack of fast forwarding?

ericandrewlewis commented 9 years ago

How about a call for speakers via an "issue" in the repo for each month. Speakers can apply by commenting on the issue.

RichardLitt commented 8 years ago

I think that @ericandrewlewis has the right idea. We can tag the issues as 'proposals' and then close them following inclusion. This would be much better than the current plan.

@jed @brianloveswords what can we do to speed this along?

jed commented 8 years ago

we're looking to change the workflow in a way that might change the conflict issue, but haven't gotten around to finishing it yet: https://github.com/brooklynjs/brooklynjs.github.io/tree/jekyllize/_talks

RichardLitt commented 8 years ago

Couldn't we just use issues and then have them PR with your suggested format if they get accepted?

What needs to change for that branch to work?

modernserf commented 7 years ago

Are y'all still interested in this at all? I've got some spare time to work on it.

willmanduffy commented 7 years ago

We just moved over to using Github Issues instead of PRs. Thanks for the input y'all!