[AWS] Two patches for aws.smtp.client send to aws-patches at lists.forge.open-do.org

[Pascal Obry]

On Mon, Feb 14, 2011 at 2:50 PM, Thomas Løcke <thomas.granvej6 at gmail.com> wrote:
> Yea, I'm pretty convinced that the error is due to me failing
> somewhere. I think I simply forgot to apply Pascal's original style
> patch to my patch.

You should have:

   -> update master to get upstream changes
   $ git checkout master
   $ git pull

   -> rebase your topic branch on top of it
   $ git checkout topic
   $ git rebase master
   (resolve conflict if required)

   -> then create patches
   $ git format-patch ...

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595