Crowdin translations (translation-batch-160285210) (#16087)
* New Crowdin translations by Github Action * Remove bad translations * Remove broken translations * Remove more broken files * Remove broken translation * Remove broken translations * Remove broken translations * Add english versions of broken translations Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Chiedo <chiedo@users.noreply.github.com>
This commit is contained in:
@@ -11,9 +11,9 @@ versions:
|
||||
If another person has pushed to the same branch as you, Git won't be able to push your changes:
|
||||
|
||||
```shell
|
||||
$ git push origin master
|
||||
$ git push origin main
|
||||
> To https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
> ! [rejected] master -> master (non-fast-forward)
|
||||
> ! [rejected] main -> main (non-fast-forward)
|
||||
> error: failed to push some refs to 'https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git'
|
||||
> To prevent you from losing history, non-fast-forward updates were rejected
|
||||
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
|
||||
|
||||
@@ -33,7 +33,7 @@ If you create a new clone of the repository, you won't lose any of your Git hist
|
||||
{% endtip %}
|
||||
|
||||
{% endwindows %}
|
||||
- `BRANCH-NAME`: The default branch for your current project, for example, `master` or `gh-pages`.
|
||||
- `BRANCH-NAME`: The default branch for your current project, for example, `main` or `gh-pages`.
|
||||
```shell
|
||||
$ git filter-branch --prune-empty --subdirectory-filter <em>FOLDER-NAME BRANCH-NAME </em>
|
||||
# Filter the specified branch in your directory and remove empty commits
|
||||
|
||||
Reference in New Issue
Block a user