Hi all,
Now that Play 2.6.x is out, any bug fixes should be applied to master first, and then backported to the 2.6.x branch.
So, I have two branches up in my system:
USER=<your github id>
mkdir -p $HOME/work/playframework
cd $HOME/work/playframework
hub clone playframework/playframework master
cd master
hub fork $USER
git worktree add $HOME/work/playframework/2.6.x 2.6.x
And then, when you're ready to backport a PR, you can do the following:
#!/bin/bash
BRANCH=2.6.x
PR=$1;
cd $HOME/work/playframework/$BRANCH;
git checkout -b backport-$PR;
After you've applied the commits to the current branch, verified that there are no merge conflicts and run it through the test suite, you can go ahead and submit it:
git push $USER backport-$PR;
hub pull-request -b $BRANCH --browse;
That's it!
--
Will Sargent
Engineer, Lightbend, Inc.