Re: [sqlmap-users] error in update

[Iago S. <146...@gm...>]

Yes, "Already on 'master'" show me when I put -f.

On Fri, Jul 13, 2012 at 3:00 PM, Miroslav Stampar <
mir...@gm...> wrote:

> But have you tried with -f?
> On Jul 13, 2012 7:51 PM, "Iago Sousa" <146...@gm...> wrote:
>
>> Already on 'master'
>> Your branch is behind 'origin/master' by 79 commits, and can be
>> fast-forwarded.
>>
>> On Fri, Jul 13, 2012 at 2:47 PM, Miroslav Stampar <
>> mir...@gm...> wrote:
>>
>>> Hi Iago.
>>>
>>> Try with:
>>> git checkout -f master
>>>
>>> Kind regards,
>>> Miroslav Stampar
>>>
>>> On Fri, Jul 13, 2012 at 7:43 PM, Iago Sousa <146...@gm...> wrote:
>>>
>>>> I receive that error when I try to update with 'git pull'.
>>>>
>>>> error: Untracked working tree file 'extra/ansistrm/__init__.py' would
>>>> be overwritten by merge.  Aborting
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> Live Security Virtual Conference
>>>> Exclusive live event will cover all the ways today's security and
>>>> threat landscape has changed and how IT managers can respond.
>>>> Discussions
>>>> will include endpoint security, mobile security and the latest in
>>>> malware
>>>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>>>> _______________________________________________
>>>> sqlmap-users mailing list
>>>> sql...@li...
>>>> https://lists.sourceforge.net/lists/listinfo/sqlmap-users
>>>>
>>>>
>>>
>>>
>>> --
>>> Miroslav Stampar
>>> http://about.me/stamparm
>>>
>>
>>
>>
>> --
>>
>>           Regards, Iago Sousa
>>   Webdesigner at Radar Topografia
>> Programmer and Security Researcher
>>
>>


-- 

          Regards, Iago Sousa
  Webdesigner at Radar Topografia
Programmer and Security Researcher