When I first started doing this for beta I did use a local tracking
branch. After about a week I switched to the cherry-pick and rebase
model. Keeping the changes as cherry-picks with the cron'd rebase
script has a few advantages in my opinion:
* It's easy to see what the delta from upstream is
On Mon, Dec 1, 2014 at 4:17 PM, Greg Grossmeier g...@wikimedia.org wrote:
Adding wikitech-l
On Mon, Dec 1, 2014 at 2:59 PM, Greg Grossmeier g...@wikimedia.org wrote:
tl;dr: Testing on deployment-salt (or other Beta
Cluster/deployment-prep vms?): please watch out for [LOCAL HACK]
commits and