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.
-Josh
On 03/11/2010 10:29 AM, Mattias Kjellsson wrote:
Hi list,
I have previously merged the vrt- branch into the gnuradio- tree and
successfully compiled and used it.
However... I'm in the middle of creating a script that sets up gnuradio and
other programs I need from a fresh installation, and I ran into some troubles
while merging different branches.
Is the procedure below the way to do this, since I get a lot of merge-
conflicts, which I don't want to script around...
git clone http://gnuradio.org/git/gnuradio.git
cd gnuradio
git remote add jblum http://gnuradio.org/git/jblum.git<-- Gives merge-
conflicts...
git pull jblum usrp2_vrt
BR
//Mattias
_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio
_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio
