On Mon, Jul 23, 2018 at 06:17:34PM +0200, Firas Hanife wrote: > Hello, > > I'm the current Italian translator for Inkscape. In the last years I worked > alone on the translations, but now I have been contacted by some users that > would like to contribute to the translation work. > > I created a fork on gitlab for Inkscape: > https://gitlab.com/FirasH/inkscape > > and for Inkscape documentation: > https://gitlab.com/FirasH/documentation > > but I don't know how to configure my fork to do the following: > 1) keep it up to date with master and 0.92.x except for the translation > files > > I added the original repo as mirrored, but as soon as I push a commit > request I get an error due to mismatch between my fork and the original one > (mirrored).
Do your work on a branch off your forked version, and that should avoid that I think. Setting it up as a mirror should work ok; I've done this in other projects. However, I don't think this is a typical workflow that translators use, so hopefully they can share some other approaches that might work better for you. For code development, many people craft their branch off the main Inkscape repo rather than off their own mirror; this tends to be simpler to set up, and (I think?) easier to send merge requests from. But again the translation team can probably give you more practical advice for your particular need. Bryce > 2) keep the "names" of the people who contributed to my fork in the commits > (that I will review, then create a merge request) > > Thanks in advance, > Firas > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > Inkscape-translator mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/inkscape-translator ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-translator mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/inkscape-translator
