[Biopython-dev] Status of SearchIO

[Kai Blin]

On 2012-10-29 21:11, Wibowo Arindrarto wrote:

Hi Bow,

> On another note, I was wondering about how to combine this rebased
> branch with my local branch. Is there a simple way to apply the
> changes in the rebased branch to my local working searchio branch or
> should I just switch to a local checkout of the rebased branch?

Well, you could rebase your local changes on top of the rebased branch. :)
Or, depending on how many changes you have in your local branch, check
our the rebased branch and then git cherry-pick your changes on top of
the rebased branch.

Cheers,
Kai

-- 
Dipl.-Inform. Kai Blin         kai.blin at biotech.uni-tuebingen.de
Institute for Microbiology and Infection Medicine
Division of Microbiology/Biotechnology
Eberhard-Karls-University of Tübingen
Auf der Morgenstelle 28                 Phone : ++49 7071 29-78841
D-72076 Tübingen                        Fax :   ++49 7071 29-5979
Deutschland
Homepage: http://www.mikrobio.uni-tuebingen.de/ag_wohlleben