All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alison Schofield <amsfield22@gmail.com>
To: Tamara Diaconita <diaconitatamara@gmail.com>
Cc: outreachy-kernel@googlegroups.com
Subject: Re: rebasing...
Date: Mon, 13 Mar 2017 16:51:22 -0700	[thread overview]
Message-ID: <20170313235121.GA8442@d830.WORKGROUP> (raw)
In-Reply-To: <CALks+gA_BQe4HEYdpYdD2b3QsWP48-UU5i3sJJZLhqQQff=Kdg@mail.gmail.com>

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


       reply	other threads:[~2017-03-13 23:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CALks+gA_BQe4HEYdpYdD2b3QsWP48-UU5i3sJJZLhqQQff=Kdg@mail.gmail.com>
2017-03-13 23:51 ` Alison Schofield [this message]
2017-03-14  0:11   ` rebasing Alison Schofield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170313235121.GA8442@d830.WORKGROUP \
    --to=amsfield22@gmail.com \
    --cc=diaconitatamara@gmail.com \
    --cc=outreachy-kernel@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.