By doing:
git clone http://gnuradio.org/git/jblum.git
git checkout -b perz origin/usrp2_vrt
I get VRT code without the need to merge.
Question:
Can I save the VRT code and re-distribute it ? The reason for this is
that I am planning to write paper. In order for others to be able to
repeat my results I want to make all the code available ... so ....
BR/
Per
Quoting Mattias Kjellsson <m...@kth.se>:
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
