libftdi Archives

Subject: What blocks master and eeprom/new from a merge?

From: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
To: libftdi@xxxxxxxxxxxxxxxxxxxxxxx
Date: Fri, 20 May 2011 12:43:42 +0200
Hello,

as I am still in the steep part of the learning curve with git, at some
point in time I accidently merged my changes to streaming read and eeprom to
one. That way, my tree diverged from either libftdi-1.0 master and eeprom-
new. As I need both features, maintainance is difficult.

Two questions: 
Why is eeprom-new  still not merged? 
How to make sure none of my internal patches gets lost?

Bye

-- 
Uwe Bonnes                bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread