PR Feedback #47
PR Feedback #47
Conversation
|
Not liking how much work it is for me to accept a conflicting PR. I have to fetch, co their branch, manually fix commits, merge, run doctoc, merge to master, then PR. Seems excessive? @unixorn @k88hudson does this sound right to you? |
|
@RichardLitt, on my other projects, I don't feel bad asking contributors to do any conflict management themselves and get it to the point I can hit the green button. On the one hand, you want to be as open as possible to contributions, on the other hand you want the PR wrangling to be as painless as possible too. I don't think it's unreasonable to ask people to merge master into their PR, especially given that people contributing to this repo should have some git chops already :-) As far as doctoc goes, agreed it is a hassle to re-run after every PR merge. dotfiles.github.io is similar in that after I merge contributions to source, I have to then do a render of the website and copy the rendered files to the master branch. On that project I merge as many PRs as I can at a time without having to wrangle conflicts, then do the render to master once at the end. |
|
@unixorn Good call. I'd feel a bit bad about that now given the delay in time for the PRs, but you're right that that's something they should be doing. And I'll try to limit doctoc to a few PRs at a time. Thanks man! |
No description provided.