search

arturadib / botio

Launch unit/regression tests directly from pull requests
http://documentup.com/arturadib/botio
112 stars 19 forks source link

Allow merging into base branches other than master #2

Closed jbuck closed 12 years ago

jbuck commented 12 years ago

I needed this fix because we're currently doing work on two diverging branches in Butter. What this does is checkout the base ref noted in the pull request (ie arturadib:master for this pull request) and then merge the head ref (ie jbuck:multiple-heads for this pull request) into that base. So whether we do a pull request against Butter's master or integration branches, it'll just work.

arturadib commented 12 years ago

awesome. as discussed on IRC let's see how that behaves in Butter.js for a week or so. then we can merge it.

thanks @jbuck

arturadib commented 12 years ago

as per conversation on IRC, this has been used in Butter.js for a week without any problems. thanks @jbuck !