Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 20de4b7

Browse filesBrowse files
committed
Merge branch '6.2' into 6.3
* 6.2: [Misc] Fixed remaining `HEAD`
2 parents 027f664 + c9a30cb commit 20de4b7
Copy full SHA for 20de4b7

File tree

2 files changed

+0
-21
lines changed
Filter options

2 files changed

+0
-21
lines changed

‎configuration.rst

Copy file name to clipboardExpand all lines: configuration.rst
-17Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,6 @@ readable. These are the main advantages and disadvantages of each format:
8484

8585
The automatic loading of PHP configuration files was introduced in Symfony 6.1.
8686

87-
<<<<<<< HEAD
88-
=======
89-
There isn't any practical difference between formats. In fact, Symfony
90-
transforms and caches all of them into PHP before running the application, so
91-
there's not even any performance difference between them.
92-
93-
YAML is used by default when installing packages because it's concise and very
94-
readable. These are the main advantages and disadvantages of each format:
95-
96-
* **YAML**: simple, clean and readable, but not all IDEs support autocompletion
97-
and validation for it. :ref:`Learn the YAML syntax <yaml-format>`;
98-
* **XML**: autocompleted/validated by most IDEs and is parsed natively by PHP,
99-
but sometimes it generates configuration considered too verbose. `Learn the XML syntax`_;
100-
* **PHP**: very powerful and it allows you to create dynamic configuration with
101-
arrays or a :ref:`ConfigBuilder <config-config-builder>`.
102-
103-
>>>>>>> 5.4
10487
Importing Configuration Files
10588
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10689

‎contributing/code/pull_requests.rst

Copy file name to clipboardExpand all lines: contributing/code/pull_requests.rst
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/6.x`` or
505505

506506
.. code-block:: terminal
507507
508-
<<<<<<< HEAD
509-
$ git rebase -f upstream/6.1
510-
=======
511508
$ git rebase -f upstream/6.x
512-
>>>>>>> 5.4
513509
$ git push --force origin BRANCH_NAME
514510
515511
.. note::

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.