Greetings,

Today I was trying to merge the last changes from pybombs/pybombs into
my own copy in csete/pybombs. The merge kept failing as if there was a
conflict in every single file.

Looking at the pybombs repository there is indeed something strange.
All history is missing and there is only one commit which in turn adds
everything?

I leave my own copy untouched for now in case you need a reference for
restoring the repository. My own copy is up to date up until the last
commit few days ago by Tom.
https://github.com/csete/pybombs

Alex

_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
https://lists.gnu.org/mailman/listinfo/discuss-gnuradio

Reply via email to