On Fri, Apr 2, 2010 at 8:47 AM, trans <[email protected]> wrote: > I figure I must be doing something terribly wrong b/c I have never > been able to make effecitve use of the Fork Queue. Almost every commit > is always "Will likely not apply cleanly". On the rare occasions when > their were some "Will likely apply cleanly" (which was only early on), > applying them sometimes failed too.
We just pushed out some Fork Queue fixes today - hopefully that makes it more reliable for you. > So Iend up applying every submitted change by hand. But then no one's > fork ever stays in sync with the master but just gets further and > further astray. At this point my "best practice" is to tell others, > after I've applied their code by hand, to either add a remote, fetch, > reset hard, and push to "+master", or to just delete their fork and > refork b/c it's easier. The best practice is to ask your contributors to not push to their master branch, but to create new, unique branches in which their changes live. For example, I have this on my Contributing[1] page for Resque: Creating a Patch * Fork defunkt/resque * Create a topic branch: `git checkout -b my_fix` * Make your changes * Push your branch: `git push origin my_fix` * Open an Issue referencing your branch. * Please do not push to `master` on your fork. This will make everyone’s life easier. We hope to encourage this convention in GitHub's UI itself in the future. -- Chris Wanstrath http://github.com/defunkt [1]: http://wiki.github.com/defunkt/resque/contributing -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
