Can't create merge request due to GitLab error message
Hi all, I'm experiencing an issue when creating a merge request on the 1.4.x branch. I see this message "You can only create or edit files when you are on a branch" and the merge request is not created. I am following the steps in https://wiki.inkscape.org/wiki/index.php?title=Interface_translation#7._Make...
Is anyone else having this issue?
Thank you, and kind regards, -- *Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
The method I used which is admittedly more convoluted but worked, is:
Fork the full Inkscape repository (so you have something like https://gitlab.com/you.name/inkscape) From the top right
Create a branch based on the 1.4 branch from the + button > New Branch
Base it on the existing 1.4 branch
Name it something like Translations for your language
Do the steps described in the wiki to replace the file .pot in your newly created Translations for your language branch
Finally do the merge request from this private 1.4 branch of yours to the official 1.4 branch
On 15/05/2024 at 16:12, Lucas Vieites lucas.vieites@gmail.com wrote:
Hi all, I'm experiencing an issue when creating a merge request on the 1.4.x branch. I see this message "You can only create or edit files when you are on a branch" and the merge request is not created.
I am following the steps in https://wiki.inkscape.org/wiki/index.php?title=Interface_translation#7._Make...
Is anyone else having this issue?
Thank you, and kind regards,
-- Lucas Vieites
Blog @ codexion.com LinkedIn
Hi Duarte, that has worked, but I have run into issues with my fork in the past, so I prefer just replacing the file on the source project.
Thank you for your suggestion. I have created https://gitlab.com/inkscape/inkscape/-/merge_requests/6452 for a partial translation of es.po.
Kind regards, -- *Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
On Wed, May 15, 2024 at 5:22 PM Duarte Ramos duarte.framos@gmail.com wrote:
The method I used which is admittedly more convoluted but worked, is:
- Fork the full Inkscape repository (so you have something like
https://gitlab.com/you.name/inkscape) From the top right 2. Create a branch based on the 1.4 branch from the + button > New Branch 3. Base it on the existing 1.4 branch 4. Name it something like *Translations for your language* 5. Do the steps described in the wiki to replace the file .pot in your newly created *Translations for your language *branch 6. Finally do the merge request from this private 1.4 branch of yours to the official 1.4 branch
On 15/05/2024 at 16:12, Lucas Vieites lucas.vieites@gmail.com wrote:
Hi all, I'm experiencing an issue when creating a merge request on the 1.4.x branch. I see this message "You can only create or edit files when you are on a branch" and the merge request is not created. I am following the steps in https://wiki.inkscape.org/wiki/index.php?title=Interface_translation#7._Make...
Is anyone else having this issue?
Thank you, and kind regards,
*Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
Hi Lucas,
replacing files in the source project isn't possible for anyone but project maintainers, at least for Inkscape.
Everything must pass through a merge request, and every merge request must come from one of your own branches.
Duarte's 'convoluted' method is the way to go.
To keep the original Inkscape branches in it up-to-date, you could setup your own repository to mirror protected branches in the original Inkscape repository. Then - as long as you do not change those branches, but always branch off them - your own repository's main branches ('master', '1.n.x') will always be in sync with the original Inkscape repository.
Maren
Am 15.05.24 um 17:44 schrieb Lucas Vieites:
Hi Duarte, that has worked, but I have run into issues with my fork in the past, so I prefer just replacing the file on the source project.
Thank you for your suggestion. I have created https://gitlab.com/inkscape/inkscape/-/merge_requests/6452 https://gitlab.com/inkscape/inkscape/-/merge_requests/6452 for a partial translation of es.po.
Kind regards,
*Lucas Vieites https://namedrop.io/lucasvieites* Blog @ codexion.com https://blog.codexion.com/ LinkedIn https://www.linkedin.com/in/lucasvieites
On Wed, May 15, 2024 at 5:22 PM Duarte Ramos <duarte.framos@gmail.com mailto:duarte.framos@gmail.com> wrote:
The method I used which is admittedly more convoluted but worked, is: 1. Fork the full Inkscape repository (so you have something like https://gitlab.com/you.name/inkscape <https://gitlab.com/you.name/inkscape>) From the top right 2. Create a branch based on the 1.4 branch from the + button > New Branch 3. Base it on the existing 1.4 branch 4. Name it something like /Translations for your language/ 5. Do the steps described in the wiki to replace the file .pot in your newly created /Translations for your language /branch 6. Finally do the merge request from this private 1.4 branch of yours to the official 1.4 branch On 15/05/2024 at 16:12, Lucas Vieites <lucas.vieites@gmail.com <mailto:lucas.vieites@gmail.com>> wrote: Hi all, I'm experiencing an issue when creating a merge request on the 1.4.x branch. I see this message "You can only create or edit files when you are on a branch" and the merge request is not created. I am following the steps in https://wiki.inkscape.org/wiki/index.php?title=Interface_translation#7._Make_a_merge_request <https://wiki.inkscape.org/wiki/index.php?title=Interface_translation#7._Make_a_merge_request> Is anyone else having this issue? Thank you, and kind regards, -- *Lucas Vieites <https://namedrop.io/lucasvieites>* Blog @ codexion.com <https://blog.codexion.com/> LinkedIn <https://www.linkedin.com/in/lucasvieites>
Inkscape Translators mailing list -- inkscape-translator@lists.inkscape.org To unsubscribe send an email to inkscape-translator-leave@lists.inkscape.org
participants (3)
-
Duarte Ramos
-
Lucas Vieites
-
Maren Hachmann