[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Discuss-gnuradio] Merging the vrt- branch.

From: Josh Blum
Subject: Re: [Discuss-gnuradio] Merging the vrt- branch.
Date: Thu, 11 Mar 2010 11:19:34 -0800
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv: Gecko/20100217 Shredder/3.0.3pre

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.


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- 
git pull jblum usrp2_vrt


Discuss-gnuradio mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]