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
On Sat, Aug 24, 2013 at 5:30 AM, Alexandru Csete oz9...@gmail.com wrote:
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
On Sat, Aug 24, 2013 at 9:24 PM, Tom Rondeau t...@trondeau.com wrote:
On Sat, Aug 24, 2013 at 5:30 AM, Alexandru Csete oz9...@gmail.com wrote:
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
