-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 03/17/2016 05:48 AM, Oleg Broytman wrote:
> -- Interactively rebase master onto the feature branch
The directionality seems wrong here: one would be rebasing the feature
branch onto the head of `master`: "rebase master" would mean "rewrite
maste
On Fri, Mar 18, 2016 at 04:35:17AM +1100, Chris Angelico
wrote:
> On Fri, Mar 18, 2016 at 4:17 AM, Oleg Broytman wrote:
> >> I don't understand the cherry-pick: why not just merge the rebased
> >> feature branch with 'git merge --squash', and fix up the changelog in the
> >> commit message of t
An interesting example of GitHub Workflow (used by Frameworks team at BBC
News): http://www.integralist.co.uk/posts/github-workflow.html
The basis of their workflow is this:
-- Open a GitHub PR (Pull Request) by creating a new feature branch
from master
-- Make feature specific changes and req
On Fri, Mar 18, 2016 at 4:44 AM, Oleg Broytman wrote:
> On Fri, Mar 18, 2016 at 04:35:17AM +1100, Chris Angelico
> wrote:
>> On Fri, Mar 18, 2016 at 4:17 AM, Oleg Broytman wrote:
>> >> I don't understand the cherry-pick: why not just merge the rebased
>> >> feature branch with 'git merge --squ
