jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-20 10:28:40 -05:00
Code Issues Projects Releases Wiki Activity

Update all files to use {% data %} (#15253)

Browse Source 
* Add back changes from prior to purge

* Manually fix some invalid Liquid

* Updoot render-content

* Improve test messages to show correct output

* Run el scripto

* Pass the remaining test
This commit is contained in:
Jason Etcovitch
2020-09-29 16:01:04 -04:00
committed by GitHub
parent aa5a62d49d
commit caaee7a124
14816 changed files with 100317 additions and 100247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/github/using-git/dealing-with-non-fast-forward-errors.md
View File

@@ -12,9 +12,9 @@ If another person has pushed to the same branch as you, Git won't be able to pus
```shell
$ git push origin master
> To https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
> To https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git'
> 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
> 'Note about fast-forwards' section of 'git push --help' for details.