From mboxrd@z Thu Jan  1 00:00:00 1970
From: Joe Eloff <kagen101@gmail.com>
Date: Mon, 05 Jul 2010 20:43:10 +0000
Subject: Keeping up to date with the upstream
Message-Id: <1278362590.5396.35.camel@dermezel>
List-Id: <kernel-janitors.vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: kernel-janitors@vger.kernel.org

Hi

Just need clarification on this procedure:

What to do when git fetch origin tells you origin/master has diverged from your local master and 
you are working on a branch making patches?

A link or search words will be fine will do reading myself.

Regards,

Joe