From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joel Soete Subject: Re: last git update of parisc-2.6.git failed again to merge??? Date: Mon, 08 Sep 2008 21:16:54 +0000 Message-ID: <48C59646.3010507@scarlet.be> References: <48C3C03E.2050405@scarlet.be> <20080907162501.GD20992@phobos.i.cabal.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: linux-parisc To: Kyle McMartin Return-path: In-Reply-To: <20080907162501.GD20992@phobos.i.cabal.ca> List-ID: List-Id: linux-parisc.vger.kernel.org Kyle, Kyle McMartin wrote: > On Sun, Sep 07, 2008 at 11:51:26AM +0000, Joel Soete wrote: >> Hello Kyle, >> > > The history is non-linear, because I rebased it: > Ah ok it's not yet another of my mistakes lol > git fetch origin; git reset --hard origin/master > Cool, I will try on my other clone (there I use http protocol and a b180 and in this figure it takes long hours before the clone action is finished. And unfortunately I don't have enough disk space to convert this tree in a hg or recent bzr one, that would probably help me to be convienced that git is well the more effcient vcs, ozn) > while on your master branch should resolve it. But be careful, it > will remove any of your local changes. > > Well I just manage few external patch with quilt on another copy of your tree, I so not worry ;<) Tx again for advises, J.