Units
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=20
{ "count": 1190, "next": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=21", "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=19", "results": [ { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The commit message for the tag has a quick summary of what's new since the last tag" ], "previous_source": "", "target": [ "The commit message for the tag has a quick summary of what's new since the last tag" ], "id_hash": 4504267684091473190, "content_hash": 4504267684091473190, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1381", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 407, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819626/?format=api", "priority": 100, "id": 1819626, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=be825f98138b2d26", "url": "https://translate-dev.freebsd.org/api/units/1819626/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.562408Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Here 'good' means:" ], "previous_source": "", "target": [ "Here 'good' means:" ], "id_hash": -4611629037286900863, "content_hash": -4611629037286900863, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1394", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 410, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1819628/?format=api", "priority": 100, "id": 1819628, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=400033d2f4a33b81", "url": "https://translate-dev.freebsd.org/api/units/1819628/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.566832Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "All the right files, and none of the wrong ones, were merged into contrib/glorbnitz." ], "previous_source": "", "target": [ "All the right files, and none of the wrong ones, were merged into contrib/glorbnitz." ], "id_hash": -6073461124157181717, "content_hash": -6073461124157181717, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1396", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 411, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819630/?format=api", "priority": 100, "id": 1819630, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=2bb6bb49417770eb", "url": "https://translate-dev.freebsd.org/api/units/1819630/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.569840Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "No other changes are in the tree." ], "previous_source": "", "target": [ "No other changes are in the tree." ], "id_hash": 4879753971174349042, "content_hash": 4879753971174349042, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1397", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 412, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1819632/?format=api", "priority": 100, "id": 1819632, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c3b85e61fb2618f2", "url": "https://translate-dev.freebsd.org/api/units/1819632/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.572981Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The commit messages look crossref:committers-guide[commit-log-message,good]. It should contain a summary of what's changed since the last merge to the FreeBSD `main` branch and any caveats." ], "previous_source": "", "target": [ "The commit messages look crossref:committers-guide[commit-log-message,good]. It should contain a summary of what's changed since the last merge to the FreeBSD `main` branch and any caveats." ], "id_hash": -4211240507722619915, "content_hash": -4211240507722619915, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1398", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 413, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1819634/?format=api", "priority": 100, "id": 1819634, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=458eab12017523f5", "url": "https://translate-dev.freebsd.org/api/units/1819634/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.576034Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported and is beyond the scope of this tutorial." ], "previous_source": "", "target": [ "This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported and is beyond the scope of this tutorial." ], "id_hash": 8379205608149168359, "content_hash": 8379205608149168359, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1404", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 415, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 27, "source_unit": "https://translate-dev.freebsd.org/api/units/1819638/?format=api", "priority": 100, "id": 1819638, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f448eb1b0db130e7", "url": "https://translate-dev.freebsd.org/api/units/1819638/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.582328Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git config --global pull.ff only\n" ], "previous_source": "", "target": [ "% git config --global pull.ff only\n" ], "id_hash": 8903481417549201383, "content_hash": 8903481417549201383, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1419", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 419, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819640/?format=api", "priority": 100, "id": 1819640, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=fb8f852d354fbfe7", "url": "https://translate-dev.freebsd.org/api/units/1819640/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.587370Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "You may need to omit the --global if you want this setting to apply to only this repository." ], "previous_source": "", "target": [ "You may need to omit the --global if you want this setting to apply to only this repository." ], "id_hash": -7106101140713326349, "content_hash": -7106101140713326349, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1422", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 420, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 18, "source_unit": "https://translate-dev.freebsd.org/api/units/1819642/?format=api", "priority": 100, "id": 1819642, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1d620ea989c8b8f3", "url": "https://translate-dev.freebsd.org/api/units/1819642/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.590420Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd freebsd-src\n% git checkout main\n% git pull (--ff-only|--rebase)\n" ], "previous_source": "", "target": [ "% cd freebsd-src\n% git checkout main\n% git pull (--ff-only|--rebase)\n" ], "id_hash": 2448676591143734726, "content_hash": 2448676591143734726, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1428", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 421, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819644/?format=api", "priority": 100, "id": 1819644, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a1fb7262d0efcdc6", "url": "https://translate-dev.freebsd.org/api/units/1819644/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.593486Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit that didn't exist before. This can be harder to recover from." ], "previous_source": "", "target": [ "There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit that didn't exist before. This can be harder to recover from." ], "id_hash": 281741935925123948, "content_hash": 281741935925123948, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1432", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 422, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 35, "source_unit": "https://translate-dev.freebsd.org/api/units/1819646/?format=api", "priority": 100, "id": 1819646, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=83e8f2cc4925db6c", "url": "https://translate-dev.freebsd.org/api/units/1819646/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.596528Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The longer form is also recommended." ], "previous_source": "", "target": [ "The longer form is also recommended." ], "id_hash": 5353447373408456428, "content_hash": 5353447373408456428, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1434", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 423, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819648/?format=api", "priority": 100, "id": 1819648, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ca4b4405b7c24eec", "url": "https://translate-dev.freebsd.org/api/units/1819648/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.599757Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd freebsd-src\n% git checkout main\n% git fetch freebsd\n% git merge --ff-only freebsd/main\n" ], "previous_source": "", "target": [ "% cd freebsd-src\n% git checkout main\n% git fetch freebsd\n% git merge --ff-only freebsd/main\n" ], "id_hash": -3199277921394897091, "content_hash": -3199277921394897091, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1441", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 424, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1819650/?format=api", "priority": 100, "id": 1819650, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=5399e1ae5581cf3d", "url": "https://translate-dev.freebsd.org/api/units/1819650/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.602838Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "These commands reset your tree to the `main` branch, and then update it from where you pulled the tree from originally. It's important to switch to `main` before doing this so it moves forward. Now, it's time to move the changes forward:" ], "previous_source": "", "target": [ "These commands reset your tree to the `main` branch, and then update it from where you pulled the tree from originally. It's important to switch to `main` before doing this so it moves forward. Now, it's time to move the changes forward:" ], "id_hash": -6783639733495534412, "content_hash": -6783639733495534412, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1446", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 425, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 42, "source_unit": "https://translate-dev.freebsd.org/api/units/1819652/?format=api", "priority": 100, "id": 1819652, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=21dbab9a88c5ecb4", "url": "https://translate-dev.freebsd.org/api/units/1819652/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.605973Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git rebase -i main working\n" ], "previous_source": "", "target": [ "% git rebase -i main working\n" ], "id_hash": -6209179195572148056, "content_hash": -6209179195572148056, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1450", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 426, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819654/?format=api", "priority": 100, "id": 1819654, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=29d4906b552d28a8", "url": "https://translate-dev.freebsd.org/api/units/1819654/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.609176Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "This will bring up an interactive screen to change the defaults. For now, just exit the editor. Everything should just apply. If not, then you'll need to resolve the diffs. https://docs.github.com/en/free-pro-team@latest/github/using-git/resolving-merge-conflicts-after-a-git-rebase[This github document] can help you navigate this process." ], "previous_source": "", "target": [ "This will bring up an interactive screen to change the defaults. For now, just exit the editor. Everything should just apply. If not, then you'll need to resolve the diffs. https://docs.github.com/en/free-pro-team@latest/github/using-git/resolving-merge-conflicts-after-a-git-rebase[This github document] can help you navigate this process." ], "id_hash": -1117427522145404823, "content_hash": -1117427522145404823, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1457", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 427, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 39, "source_unit": "https://translate-dev.freebsd.org/api/units/1819656/?format=api", "priority": 100, "id": 1819656, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=707e1996c8473869", "url": "https://translate-dev.freebsd.org/api/units/1819656/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.612215Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git\n" ], "previous_source": "", "target": [ "% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git\n" ], "id_hash": -5214950766202829452, "content_hash": -5214950766202829452, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1466", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 430, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1819658/?format=api", "priority": 100, "id": 1819658, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=37a0c5e87b544574", "url": "https://translate-dev.freebsd.org/api/units/1819658/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.616725Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Then, verify that user name and email are configured right. We require that they exactly match the passwd entry in FreeBSD cluster." ], "previous_source": "", "target": [ "Then, verify that user name and email are configured right. We require that they exactly match the passwd entry in FreeBSD cluster." ], "id_hash": -5864855154071044197, "content_hash": -5864855154071044197, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1470", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 431, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 22, "source_unit": "https://translate-dev.freebsd.org/api/units/1819660/?format=api", "priority": 100, "id": 1819660, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=2e9bd94f8a79ff9b", "url": "https://translate-dev.freebsd.org/api/units/1819660/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.619819Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Use" ], "previous_source": "", "target": [ "Use" ], "id_hash": 201132098711784665, "content_hash": 201132098711784665, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1472", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 432, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 1, "source_unit": "https://translate-dev.freebsd.org/api/units/1819662/?format=api", "priority": 100, "id": 1819662, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=82ca909400a50cd9", "url": "https://translate-dev.freebsd.org/api/units/1819662/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.622919Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "freefall% gen-gitconfig.sh\n" ], "previous_source": "", "target": [ "freefall% gen-gitconfig.sh\n" ], "id_hash": -9139913915449683655, "content_hash": -9139913915449683655, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1476", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 433, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 2, "source_unit": "https://translate-dev.freebsd.org/api/units/1819664/?format=api", "priority": 100, "id": 1819664, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=012880b81ff8d139", "url": "https://translate-dev.freebsd.org/api/units/1819664/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.625897Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr/local/bin is in the PATH." ], "previous_source": "", "target": [ "on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr/local/bin is in the PATH." ], "id_hash": 4396191017146700825, "content_hash": 4396191017146700825, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1479", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 434, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819666/?format=api", "priority": 100, "id": 1819666, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=bd02687025cad419", "url": "https://translate-dev.freebsd.org/api/units/1819666/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.628918Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The below command merges the `working` branch into the upstream `main` branch. It's important that you curate your changes to be just like you want them in the FreeBSD source repo before doing this. This syntax pushes the `working` branch to `main`, moving the `main` branch forward. You will only be able to do this if this results in a linear change to `main` (e.g. no merges)." ], "previous_source": "", "target": [ "The below command merges the `working` branch into the upstream `main` branch. It's important that you curate your changes to be just like you want them in the FreeBSD source repo before doing this. This syntax pushes the `working` branch to `main`, moving the `main` branch forward. You will only be able to do this if this results in a linear change to `main` (e.g. no merges)." ], "id_hash": 3189879557650312767, "content_hash": 3189879557650312767, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1484", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 435, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 67, "source_unit": "https://translate-dev.freebsd.org/api/units/1819668/?format=api", "priority": 100, "id": 1819668, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ac44ba8e9606ee3f", "url": "https://translate-dev.freebsd.org/api/units/1819668/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.632062Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git push freebsd working:main\n" ], "previous_source": "", "target": [ "% git push freebsd working:main\n" ], "id_hash": -2949443258083283539, "content_hash": -2949443258083283539, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1488", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 436, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819670/?format=api", "priority": 100, "id": 1819670, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=571178fbccc66dad", "url": "https://translate-dev.freebsd.org/api/units/1819670/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.635341Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If your push is rejected due to losing a commit race, rebase your branch before trying again:" ], "previous_source": "", "target": [ "If your push is rejected due to losing a commit race, rebase your branch before trying again:" ], "id_hash": 5742174005932065455, "content_hash": 5742174005932065455, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1491", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 437, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819672/?format=api", "priority": 100, "id": 1819672, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=cfb04cd5c61002af", "url": "https://translate-dev.freebsd.org/api/units/1819672/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.638399Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout working\n% git fetch freebsd\n% git rebase freebsd/main\n% git push freebsd working:main\n" ], "previous_source": "", "target": [ "% git checkout working\n% git fetch freebsd\n% git rebase freebsd/main\n% git push freebsd working:main\n" ], "id_hash": -4940343711540059162, "content_hash": -4940343711540059162, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1498", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 438, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819674/?format=api", "priority": 100, "id": 1819674, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3b705f91c551e3e6", "url": "https://translate-dev.freebsd.org/api/units/1819674/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.641466Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Some people find it easier to merge their changes to their local `main` before pushing to the remote repository. Also, `git arc stage` moves changes from a branch to the local `main` when you need to do a subset of a branch. The instructions are similar to the prior section:" ], "previous_source": "", "target": [ "Some people find it easier to merge their changes to their local `main` before pushing to the remote repository. Also, `git arc stage` moves changes from a branch to the local `main` when you need to do a subset of a branch. The instructions are similar to the prior section:" ], "id_hash": 3598852820786329857, "content_hash": 3598852820786329857, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1506", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 440, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 50, "source_unit": "https://translate-dev.freebsd.org/api/units/1819676/?format=api", "priority": 100, "id": 1819676, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=b1f1b192ade1b901", "url": "https://translate-dev.freebsd.org/api/units/1819676/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.645185Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout main\n% git merge --ff-only `working`\n% git push freebsd\n" ], "previous_source": "", "target": [ "% git checkout main\n% git merge --ff-only `working`\n% git push freebsd\n" ], "id_hash": -1108410507881348750, "content_hash": -1108410507881348750, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1511", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 441, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 13, "source_unit": "https://translate-dev.freebsd.org/api/units/1819678/?format=api", "priority": 100, "id": 1819678, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=709e2284046c0172", "url": "https://translate-dev.freebsd.org/api/units/1819678/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.648430Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you lose the race, then try again with" ], "previous_source": "", "target": [ "If you lose the race, then try again with" ], "id_hash": 5434627182597900240, "content_hash": 5434627182597900240, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1514", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 442, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819680/?format=api", "priority": 100, "id": 1819680, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=cb6baca0f16e07d0", "url": "https://translate-dev.freebsd.org/api/units/1819680/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.651500Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git pull --rebase\n% git push freebsd\n" ], "previous_source": "", "target": [ "% git pull --rebase\n% git push freebsd\n" ], "id_hash": 2595857127125752838, "content_hash": 2595857127125752838, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1518", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 443, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 8, "source_unit": "https://translate-dev.freebsd.org/api/units/1819682/?format=api", "priority": 100, "id": 1819682, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a406564dbdff1c06", "url": "https://translate-dev.freebsd.org/api/units/1819682/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.654523Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "These commands will fetch the most recent `freebsd/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. Note: merging vendor branch commits will not work with this technique." ], "previous_source": "", "target": [ "These commands will fetch the most recent `freebsd/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. Note: merging vendor branch commits will not work with this technique." ], "id_hash": 7721083745137924651, "content_hash": 7721083745137924651, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1521", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 444, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 41, "source_unit": "https://translate-dev.freebsd.org/api/units/1819684/?format=api", "priority": 100, "id": 1819684, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=eb26ccc215fd1a2b", "url": "https://translate-dev.freebsd.org/api/units/1819684/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.657543Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git log\n" ], "previous_source": "", "target": [ "% git log\n" ], "id_hash": 9120924783604075193, "content_hash": 9120924783604075193, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1530", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 447, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1819686/?format=api", "priority": 100, "id": 1819686, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=fe9408c415c70ab9", "url": "https://translate-dev.freebsd.org/api/units/1819686/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.661991Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you have a specific version in mind, you can use this construct:" ], "previous_source": "", "target": [ "If you have a specific version in mind, you can use this construct:" ], "id_hash": -554908169959170842, "content_hash": -554908169959170842, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1533", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 448, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 13, "source_unit": "https://translate-dev.freebsd.org/api/units/1819688/?format=api", "priority": 100, "id": 1819688, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=784c91f59e9f1ce6", "url": "https://translate-dev.freebsd.org/api/units/1819688/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.665106Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git log --grep revision=XXXX\n" ], "previous_source": "", "target": [ "% git log --grep revision=XXXX\n" ], "id_hash": -7336498280067449201, "content_hash": -7336498280067449201, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1537", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 449, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819690/?format=api", "priority": 100, "id": 1819690, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1a2f85af4950be8f", "url": "https://translate-dev.freebsd.org/api/units/1819690/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.668216Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "to find the specific revision. The hex number after 'commit' is the hash you can use to refer to this commit." ], "previous_source": "", "target": [ "to find the specific revision. The hex number after 'commit' is the hash you can use to refer to this commit." ], "id_hash": -1783242142227726383, "content_hash": -1783242142227726383, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1541", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 450, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 21, "source_unit": "https://translate-dev.freebsd.org/api/units/1819692/?format=api", "priority": 100, "id": 1819692, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6740a6b83c027fd1", "url": "https://translate-dev.freebsd.org/api/units/1819692/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.671265Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "We use the common convention of having the origin for the FreeBSD repository being 'freebsd' rather than the default 'origin' to allow people to use that for their own development and to minimize \"whoops\" pushes to the wrong repository." ], "previous_source": "", "target": [ "We use the common convention of having the origin for the FreeBSD repository being 'freebsd' rather than the default 'origin' to allow people to use that for their own development and to minimize \"whoops\" pushes to the wrong repository." ], "id_hash": 5613396849383208050, "content_hash": 5613396849383208050, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1551", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 453, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 39, "source_unit": "https://translate-dev.freebsd.org/api/units/1819694/?format=api", "priority": 100, "id": 1819694, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=cde6cab186c87472", "url": "https://translate-dev.freebsd.org/api/units/1819694/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.675616Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "First, you need to clone the FreeBSD repository, shown here cloning into `freebsd-current` to reduce confusion. $URL is whatever mirror works best for you:" ], "previous_source": "", "target": [ "First, you need to clone the FreeBSD repository, shown here cloning into `freebsd-current` to reduce confusion. $URL is whatever mirror works best for you:" ], "id_hash": 656475680107907994, "content_hash": 656475680107907994, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1567", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 458, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 24, "source_unit": "https://translate-dev.freebsd.org/api/units/1819696/?format=api", "priority": 100, "id": 1819696, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=891c45272483cb9a", "url": "https://translate-dev.freebsd.org/api/units/1819696/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.681373Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' $URL freebsd-current\n" ], "previous_source": "", "target": [ "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' $URL freebsd-current\n" ], "id_hash": 5429994073046223948, "content_hash": 5429994073046223948, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1571", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 459, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819698/?format=api", "priority": 100, "id": 1819698, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=cb5b36d710658c4c", "url": "https://translate-dev.freebsd.org/api/units/1819698/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.684524Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "then once that's cloned, you can simply create a worktree from it:" ], "previous_source": "", "target": [ "then once that's cloned, you can simply create a worktree from it:" ], "id_hash": -71015273303596227, "content_hash": -71015273303596227, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1574", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 460, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1819700/?format=api", "priority": 100, "id": 1819700, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7f03b3fc351ca33d", "url": "https://translate-dev.freebsd.org/api/units/1819700/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.687651Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd freebsd-current\n% git worktree add ../freebsd-stable-12 stable/12\n" ], "previous_source": "", "target": [ "% cd freebsd-current\n% git worktree add ../freebsd-stable-12 stable/12\n" ], "id_hash": -4607600396361861553, "content_hash": -4607600396361861553, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1579", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 461, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819702/?format=api", "priority": 100, "id": 1819702, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=400e83da03e6f64f", "url": "https://translate-dev.freebsd.org/api/units/1819702/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.690741Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory. Once created, it's updated very similarly to how you might expect:" ], "previous_source": "", "target": [ "this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory. Once created, it's updated very similarly to how you might expect:" ], "id_hash": -3014182078002186630, "content_hash": -3014182078002186630, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1583", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 462, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 27, "source_unit": "https://translate-dev.freebsd.org/api/units/1819704/?format=api", "priority": 100, "id": 1819704, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=562b795eb054b67a", "url": "https://translate-dev.freebsd.org/api/units/1819704/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.693797Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd freebsd-current\n% git checkout main\n% git pull --ff-only\n# changes from upstream now local and current tree updated\n% cd ../freebsd-stable-12\n% git merge --ff-only freebsd/stable/12\n# now your stable/12 is up to date too\n" ], "previous_source": "", "target": [ "% cd freebsd-current\n% git checkout main\n% git pull --ff-only\n# changes from upstream now local and current tree updated\n% cd ../freebsd-stable-12\n% git merge --ff-only freebsd/stable/12\n# now your stable/12 is up to date too\n" ], "id_hash": 1700054451182092585, "content_hash": 1700054451182092585, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1593", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 463, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 38, "source_unit": "https://translate-dev.freebsd.org/api/units/1819706/?format=api", "priority": 100, "id": 1819706, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=9797ce841d87c129", "url": "https://translate-dev.freebsd.org/api/units/1819706/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.696942Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "I recommend using `--ff-only` because it's safer and you avoid accidentally getting into a 'merge nightmare' where you have an extra change in your tree, forcing a complicated merge rather than a simple one." ], "previous_source": "", "target": [ "I recommend using `--ff-only` because it's safer and you avoid accidentally getting into a 'merge nightmare' where you have an extra change in your tree, forcing a complicated merge rather than a simple one." ], "id_hash": -1322389338575791826, "content_hash": -1322389338575791826, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1596", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 464, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 34, "source_unit": "https://translate-dev.freebsd.org/api/units/1819708/?format=api", "priority": 100, "id": 1819708, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6da5ede7236d192e", "url": "https://translate-dev.freebsd.org/api/units/1819708/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.700163Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Here's https://adventurist.me/posts/00296[a good writeup] that goes into more detail." ], "previous_source": "", "target": [ "Here's https://adventurist.me/posts/00296[a good writeup] that goes into more detail." ], "id_hash": 4024942658330683659, "content_hash": 4024942658330683659, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1598", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 465, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819710/?format=api", "priority": 100, "id": 1819710, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=b7db7805cf1de90b", "url": "https://translate-dev.freebsd.org/api/units/1819710/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.703341Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Second, don't push. In fact, you can fix almost anything if you haven't pushed. All the answers in this section assume no push has happened." ], "previous_source": "", "target": [ "Second, don't push. In fact, you can fix almost anything if you haven't pushed. All the answers in this section assume no push has happened." ], "id_hash": 2498010028987628526, "content_hash": 2498010028987628526, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1610", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 470, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1819712/?format=api", "priority": 100, "id": 1819712, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a2aab6e2e72bbbee", "url": "https://translate-dev.freebsd.org/api/units/1819712/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.708730Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The following answer assumes you committed to `main` and want to create a branch called `issue`:" ], "previous_source": "", "target": [ "The following answer assumes you committed to `main` and want to create a branch called `issue`:" ], "id_hash": -3118827232501127906, "content_hash": -3118827232501127906, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1612", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 471, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1819714/?format=api", "priority": 100, "id": 1819714, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=54b7b32802f4a51e", "url": "https://translate-dev.freebsd.org/api/units/1819714/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.711881Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "# We're on branch wilma\n% git checkout fred\t\t# move to fred branch\n% git cherry-pick wilma\t\t# copy the misplaced commit\n% git checkout wilma\t\t# go back to wilma branch\n% git reset --hard HEAD^\t# move what wilma refers to back 1 commit\n" ], "previous_source": "", "target": [ "# We're on branch wilma\n% git checkout fred\t\t# move to fred branch\n% git cherry-pick wilma\t\t# copy the misplaced commit\n% git checkout wilma\t\t# go back to wilma branch\n% git reset --hard HEAD^\t# move what wilma refers to back 1 commit\n" ], "id_hash": -7891680808721537818, "content_hash": -7891680808721537818, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1636", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 476, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 47, "source_unit": "https://translate-dev.freebsd.org/api/units/1819716/?format=api", "priority": 100, "id": 1819716, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=127b1e1dcb62a4e6", "url": "https://translate-dev.freebsd.org/api/units/1819716/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.717605Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If it is not the last commit, you can cherry-pick that one change from wilma onto fred, then use `git rebase -i` to remove the change from wilma." ], "previous_source": "", "target": [ "If it is not the last commit, you can cherry-pick that one change from wilma onto fred, then use `git rebase -i` to remove the change from wilma." ], "id_hash": 1035417330892286325, "content_hash": 1035417330892286325, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1639", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 477, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 28, "source_unit": "https://translate-dev.freebsd.org/api/units/1819718/?format=api", "priority": 100, "id": 1819718, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8e5e8a939a1e2975", "url": "https://translate-dev.freebsd.org/api/units/1819718/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.720791Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree. You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor. Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split. You can undo it with the following sequence:" ], "previous_source": "", "target": [ "The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree. You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor. Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split. You can undo it with the following sequence:" ], "id_hash": -1281199930840120073, "content_hash": -1281199930840120073, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1668", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 483, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 82, "source_unit": "https://translate-dev.freebsd.org/api/units/1819720/?format=api", "priority": 100, "id": 1819720, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6e384373740504f7", "url": "https://translate-dev.freebsd.org/api/units/1819720/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.727363Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout pre-split\t# Go back\n% git branch -D fred\t\t# delete the fred branch\n% git checkout -B wilma\t\t# reset the wilma branch\n% git branch -d pre-split\t# Pretend it didn't happen\n" ], "previous_source": "", "target": [ "% git checkout pre-split\t# Go back\n% git branch -D fred\t\t# delete the fred branch\n% git checkout -B wilma\t\t# reset the wilma branch\n% git branch -d pre-split\t# Pretend it didn't happen\n" ], "id_hash": -7807755195521577276, "content_hash": -7807755195521577276, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1675", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 484, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 37, "source_unit": "https://translate-dev.freebsd.org/api/units/1819722/?format=api", "priority": 100, "id": 1819722, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=13a5480455b9cec4", "url": "https://translate-dev.freebsd.org/api/units/1819722/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.730744Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The last step is optional. If you are going to try again to split, you'd omit it." ], "previous_source": "", "target": [ "The last step is optional. If you are going to try again to split, you'd omit it." ], "id_hash": -517042418034755642, "content_hash": -517042418034755642, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1679", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 485, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819724/?format=api", "priority": 100, "id": 1819724, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=78d318a9033ab7c6", "url": "https://translate-dev.freebsd.org/api/units/1819724/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.733952Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "So I created a wilma branch and committed a couple of things to it, then decided I wanted to split it into fred and wilma. Nothing weird happened when I did that, but let's say it did. The way to look at what you've done is with the `git reflog`:" ], "previous_source": "", "target": [ "So I created a wilma branch and committed a couple of things to it, then decided I wanted to split it into fred and wilma. Nothing weird happened when I did that, but let's say it did. The way to look at what you've done is with the `git reflog`:" ], "id_hash": 3450196640342795500, "content_hash": 3450196640342795500, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1689", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 488, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 50, "source_unit": "https://translate-dev.freebsd.org/api/units/1819726/?format=api", "priority": 100, "id": 1819726, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=afe18f9080e0e4ec", "url": "https://translate-dev.freebsd.org/api/units/1819726/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.738369Z" } ] }