git problem

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



... 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

[Index of Archives]     [Video For Linux]     [Yosemite News]     [gtk]     [GIMP for Windows]     [KDE]     [Scanners]     [GEGL]     [Gimp's Home]     [Gimp on Windows]     [Steve's Art]     [Webcams]

  Powered by Linux