Re: Re: Error committing compounds.txt

2013-08-20 Thread Jaume OrtolĂ  i Font
2013/8/20 Marco A.G.Pinto marcoagpi...@mail.telepac.pt


 Could someone add this file again to the Portuguese folder?


Done.

Jaume
--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel


Re: Re: Error committing compounds.txt

2013-08-20 Thread Dominique Pellé
Marco A.G.Pinto wrote:

 Hello!

 I have done a mistake somehow.

 I tried to commit the file but it wasn't working.

 So, I tried to revert the changes.txt like Daniel suggested
 in the private e-mail but no success since the revert
 option didn't appear.

No, you should have done a git pull --rebase  (I don't know
how this is done with tortoise) so that it pulls the latest from
the repository and merge with your current change.

Note that this situation is likely to happen frequently, so you
have to make sure it works next time. To reduce the likelyhood
of having to merge, it's best to always pull the latest before
making changes in your clone repository.

 I tried SVN delete in the compounds.txt and then add it but
 I kept getting an error.

Ah, no, don't do that.  That will delete the file in the repository :-(
Of course we can go back in time, but the history in git will
show that this file has been deleted then put back.

Regards
Dominique

--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk
___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel


Re: Error committing compounds.txt

2013-08-20 Thread Marco A.G.Pinto

  
  
Thanks, Jaume  :-) 
  
  On 20/08/2013 12:04, Jaume Ortol i Font wrote:


  2013/8/20 Marco A.G.Pinto marcoagpi...@mail.telepac.pt

  

  
Could someone add this file again to the Portuguese
folder?



Done.


Jaume

  

  


-- 
  
  

--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel


Re: Error committing compounds.txt

2013-08-20 Thread Marco A.G.Pinto

  
  
Dominique,
  
  Thanks!
  
  Where can I download GIT software like Tortoise (for Windows)?
  
  Is it easy to use?
  
  I will first try like Panagiotis Minos suggested and do a fresh
  checkout everytime I have problems... but, if it doesn't fix it, I
  will have to move to GIT software.
  
  Thanks!
  
  
  Kind regards,
   Marco A.G.Pinto
   ---
  
  
  On 20/08/2013 12:19, Dominique Pell wrote:


  No, you should have done a "git pull --rebase" (I don't know
  how this is done with tortoise) so that it pulls the latest from
  the repository and merge with your current change.
  Note that this situation is likely to happen frequently, so you
  have to make sure it works next time. To reduce the likelyhood
  of having to merge, it's best to always pull the latest before
  making changes in your clone repository.


-- 
  
  

--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel


Re: Error committing compounds.txt

2013-08-20 Thread Daniel Naber
On 2013-08-20 14:37, Marco A.G.Pinto wrote:

  Is it easy to use?

Not really - I recommend you stay with svn and try to fix the problems 
instead. You will need to find how to revert a local change in tortoise, 
I'm sure there's a tutorial, or otherwise Google will help you.

Regards
  Daniel

-- 
http://www.danielnaber.de

--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk
___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel


Re: Error committing compounds.txt

2013-08-20 Thread Xavi Ivars
I'd really suggest using the Github tool for windows. It has quite a lot of
documentation, and it's pretty easy to use.

http://windows.github.com/


2013/8/20 Daniel Naber list2...@danielnaber.de

 On 2013-08-20 14:37, Marco A.G.Pinto wrote:

   Is it easy to use?

 Not really - I recommend you stay with svn and try to fix the problems
 instead. You will need to find how to revert a local change in tortoise,
 I'm sure there's a tutorial, or otherwise Google will help you.

 Regards
   Daniel

 --
 http://www.danielnaber.de


 --
 Introducing Performance Central, a new site from SourceForge and
 AppDynamics. Performance Central is your source for news, insights,
 analysis and resources for efficient Application Performance Management.
 Visit us today!
 http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk
 ___
 Languagetool-devel mailing list
 Languagetool-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/languagetool-devel




-- 
 Xavi Ivars 
 http://xavi.ivars.me 
--
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511iu=/4140/ostg.clktrk___
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel