Re: rebasing...

Re: rebasing...

[Alison Schofield]

On Mon, Mar 13, 2017 at 11:19:32PM +0000, Tamara Diaconita wrote:
> Hi,
> I just received a feedback from Greg. He me this about the last path set I
> sent : "This patch does not apply to my staging-testing branch at all.  Can
> you
> please rebase all of these and resend them?"
> Does it mean that I have to make the changes again? And which could be the
> reason for not applyng to his staging-testing branch?

Hi Tamara, 

CC'ing outreachy group. This comes up periodically.

First, take a peek here to get a feel for the rate of change in staging-testing:
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/log/?h=staging-testing

Greg is constantly applying patches, not just from Outreachy.  This
means you need to fetch and rebase often.  Most of the time, you'll
get a bunch of updates that don't touch the thing you're working on,
but sometimes, and that's when it counts, the files you are working
have been changed.  The git rebase process will attempt to lay your
commits back on top after rebasing.  If it can't, it walks you thru
the merge conflicts.

Look back at the first patch tutorial - "Update your kernel"
section for the fetch and rebase steps.

alisons










> 
> Thanks,
> Tamara

Re: rebasing...

[Alison Schofield]

On Mon, Mar 13, 2017 at 04:51:22PM -0700, Alison Schofield wrote:
> On Mon, Mar 13, 2017 at 11:19:32PM +0000, Tamara Diaconita wrote:
> > Hi,
> > I just received a feedback from Greg. He me this about the last path set I
> > sent : "This patch does not apply to my staging-testing branch at all.  Can
> > you
> > please rebase all of these and resend them?"
> > Does it mean that I have to make the changes again? And which could be the
> > reason for not applyng to his staging-testing branch?
> 
> Hi Tamara, 
> 
> CC'ing outreachy group. This comes up periodically.
> 
> First, take a peek here to get a feel for the rate of change in staging-testing:
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/log/?h=staging-testing
> 
> Greg is constantly applying patches, not just from Outreachy.  This
> means you need to fetch and rebase often.  Most of the time, you'll
> get a bunch of updates that don't touch the thing you're working on,
> but sometimes, and that's when it counts, the files you are working
> have been changed.  The git rebase process will attempt to lay your
> commits back on top after rebasing.  If it can't, it walks you thru
> the merge conflicts.
> 
> Look back at the first patch tutorial - "Update your kernel"
> section for the fetch and rebase steps.
> 
> alisons

Worth mentioning, it's not a [RESEND PATCH] Those are only used when
nothing has changed in the patch.   It will be the next version of 
the patchset.
and 

> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> > 
> > Thanks,
> > Tamara