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=48897511&iu=/4140/ostg.clktrk _______________________________________________ Languagetool-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/languagetool-devel
