From: Imran M Yousuf Date: Thu, 29 May 2008 04:38:21 GMT Subject: Re: How to merge branches except for one commit Message-ID: <7bfdc29a0805282138kabc5417i4f67ae3995bf238c@mail.gmail.com> In-Reply-To: <7vhcchrb43.fsf@gitster.siamese.dyndns.org> > > You can never plan ahead perfectly, so do not be too hard on yourself if > you occasionally screw up. Cherry-picking from time to time is Ok. With > practice, you will get used to it. I juggle 5 integration branches to > maintain git.git itself and it took some practice for me to get > comfortable with the workflow. > I always wanted to know how you did it, thanks for sharing it :). Best regards, -- Imran M Yousuf Email: imran@smartitengineering.com Blog: http://imyousuf-tech.blogs.smartitengineering.com/ Mobile: +880-1711402557