On Thu, Mar 11, 2010 at 11:19, Josh B. [email protected] wrote:
Its probably the set antenna feature that was added to the usrp2 in the git
master. The merge will definitely not be clean. The easiest thing you can do
would be to merge the reverse diffs for the "set antenna "change set. Then
your rebase/merge should work.
I think it is important to point out that the VRT branch in question
is no longer being developed and no longer planned to be merged into
the 3.3git master. Instead this functionality is intended to be
reimplemented as part of the UHD software from Ettus R… The
above merge conflict is an indication that the git master is evolving
in incompatible ways and that such merge conflicts will only increase.
While developer experiences with the VRT branch are useful feedback
for UHD development, it is very likely that user code written to the
VRT branch’s version of the libusrp2 API will need to be rewritten.