On Sat, Aug 24, 2013 at 9:24 PM, Tom Rondeau wrote:
> On Sat, Aug 24, 2013 at 5:30 AM, Alexandru Csete 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 s
On Sat, Aug 24, 2013 at 5:30 AM, Alexandru Csete 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 there is i
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
