carpentries / glosario

A multilingual glossary for computing and data science terms.
https://glosario.carpentries.org
Other
104 stars 227 forks source link

Translate "branch" to Ukrainian #703

Closed Herobread closed 2 months ago

Herobread commented 2 months ago

Fill in each of the sections (using NA for those that are not applicable).

Author:

Language:

Terms defined:

olexandr-konovalov commented 2 months ago

@Herobread please edit the title of this PR to put quotes around "branch" like in other cases.

Otherwise, it sounds like you took some branch in this repository and translated it's whole content into Ukrainian.

Herobread commented 2 months ago

@olexandr-konovalov updated

Herobread commented 2 months ago

@Herobread @olexandr-konovalov updated, please review

olexandr-konovalov commented 2 months ago

@Herobread this now shows conflicts with the main branch. You need to rebase your PR on the latest state of the main branch:

git checkout main
git pull <alias for this repository>
git checkout <this branch>
git rebase -i main

and follow the instructions

Herobread commented 2 months ago

oh no, why it shows 25 commits

working on it

olexandr-konovalov commented 2 months ago

you don't really have to merge main into your feature branch... the result of rebasing should just look like your branch starts off the latest state of main

olexandr-konovalov commented 2 months ago

Text is fine. Would be nice to refactor the history before merging

Herobread commented 2 months ago

@olexandr-konovalov @YehorBoiar I have tidied up the git history