I had a similar problem for ru files. I copied all my changes off-site, did a clean checkout and copied the files back. I had to do it because I didn't know how to get git to merge changes. "Nuke them from orbit, that's the only way to be sure!" :-) On Fri, Nov 6, 2009 at 8:00 PM, <gimp-docs-request@xxxxxxxxxxxxxxxxxxxxxx> wrote: > Send Gimp-docs mailing list submissions to > gimp-docs@xxxxxxxxxxxxxxxxxxxxxx > > To subscribe or unsubscribe via the World Wide Web, visit > https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs > or, via email, send a message with subject or body 'help' to > gimp-docs-request@xxxxxxxxxxxxxxxxxxxxxx > > You can reach the person managing the list at > gimp-docs-owner@xxxxxxxxxxxxxxxxxxxxxx > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Gimp-docs digest..." > > > Today's Topics: > > 1. git problem (Marco Ciampa) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 6 Nov 2009 20:21:12 +0100 > From: "Marco Ciampa" <ciampix@xxxxxxxxx> > Subject: git problem > To: gimp-docs@xxxxxxxxxxxxxxxxxxxxxx > Message-ID: <20091106192112.GA10862@xxxxxxxxxxx> > Content-Type: text/plain; charset=us-ascii > > > ... beside from the fact that I'm not translating anything new due to the > fact that one of the last git push destroied ~400 po italian messages (tell me > if I'm wrong and why in case I'm doing something wrong myself...) now I'm > stuck on git pull too. This is the error message: > > error: Entry 'src/menus/edit/stroke-path.xml' not uptodate. Cannot merge. > > please help > > bye > > -- > > Marco Ciampa > > +--------------------+ > | Linux User #78271 | > | FSFE fellow #364 | > +--------------------+ > > > ------------------------------ > > _______________________________________________ > Gimp-docs mailing list > Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx > https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs > > > End of Gimp-docs Digest, Vol 66, Issue 1 > **************************************** > _______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
