Re: [core-workflow] GitHub Workflow

2016-03-20 Thread Barry Warsaw
On Mar 17, 2016, at 06:44 PM, Oleg Broytman wrote: >Me too. I have never used squashed merge. But "branchiful" >development has its own troubles like problems with bisect. Only when you don't have a clear main-line-of-development (like git ). But I usually don't squash merges or feature branches

Re: [core-workflow] GitHub Workflow

2016-03-20 Thread Chris Angelico
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 the merge commit? > >That would require a lot of manual editing of the

Re: [core-workflow] GitHub Workflow

2016-03-19 Thread Tres Seaver
-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

Re: [core-workflow] GitHub Workflow

2016-03-19 Thread Oleg Broytman
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

[core-workflow] GitHub Workflow

2016-03-19 Thread Oleg Broytman
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

Re: [core-workflow] GitHub Workflow

2016-03-19 Thread Chris Angelico
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

Re: [core-workflow] GitHub Workflow

2016-03-18 Thread Oleg Broytman
On Fri, Mar 18, 2016 at 05:14:52AM +1100, Chris Angelico wrote: > 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

Re: [core-workflow] GitHub Workflow

2016-03-18 Thread Oleg Broytman
On Thu, Mar 17, 2016 at 10:13:53AM -0400, Tres Seaver wrote: > -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 featu