[Biopython-dev] Merging branches

[Tiago Antão]

Me thinks I need to get a book on git and understand, once and for
all, the basic concepts. I am getting merge conflicts with cherry
picking and I don't even understand why

Anyway it would be nice (but not fundamental) to merge just a single file.

2009/4/4 Peter <biopython at maubp.freeserve.co.uk>:
> 2009/4/4 Tiago Antão:
>> Is there any way to just get partial merge? In this case I only want
>> to merge a single sub dir (although, in general one might just want
>> to import a single file)
>
> Can you cherry pick the changes you want?  Github's fork queue
> provides another approach to the same issue.  However, these both work
> on patches (individual commits)  rather than files/directories.
>
> Peter
>



-- 
 "A man who dares to waste one hour of time has not discovered the
value of life" - Charles Darwin