1
0
Fork 0
Commit Graph

7 Commits (37d722e73c847fb74fb9fd542e350cd77997a72d)

Author SHA1 Message Date
PrinsFrank 7290f5b437
Document recovering from invalid merges on composer.lock and composer.json (#11154) 2022-12-21 10:16:02 +01:00
Jeffrey Cafferata ceec6ff8e2
Documentation code syntax highlighting (#11011)
* Add newline at end of file.

* Create a uniformat in the code syntax highlighting by using the main syntax `shell` instead of the alias `bash`/`sh`.

* Added (of corrected) the missing code syntax highlighting.

* Split the shell commands from the text outputs.

* Fix JSON samples formatting.

* Checked the commands and updated the text output.
2022-08-20 12:23:00 +02:00
immeëmosol bbcadcb35e
Hint at improved merge conflict resolving (#10840) 2022-06-22 13:47:15 +02:00
gnito-org 239638e687
Fix minor spelling & grammar issues in docs (#10370) 2021-12-19 15:15:21 +01:00
Wouter de Jong bb128c465c Capitalize Composer in the docs 2021-10-25 13:11:56 +02:00
Wouter de Jong 6aec6ecbfa Use `composer.phar` consistently in the examples 2021-10-25 13:11:41 +02:00
PrinsFrank 3d5be62250
Add article on resolving merge conflicts (#9386) 2020-11-13 15:38:28 +01:00