From a41876f37be948f7ac73666dae8296b86de216b9 Mon Sep 17 00:00:00 2001 From: Alexandre Daubois Date: Thu, 26 Jan 2023 13:36:36 +0100 Subject: [PATCH] [Misc] Fixed remaining `HEAD` --- configuration.rst | 17 ----------------- contributing/code/pull_requests.rst | 4 ---- 2 files changed, 21 deletions(-) diff --git a/configuration.rst b/configuration.rst index 97c1df43e6b..75802149c45 100644 --- a/configuration.rst +++ b/configuration.rst @@ -106,23 +106,6 @@ readable. These are the main advantages and disadvantages of each format: } } -<<<<<<< HEAD -======= -There isn't any practical difference between formats. In fact, Symfony -transforms and caches all of them into PHP before running the application, so -there's not even any performance difference between them. - -YAML is used by default when installing packages because it's concise and very -readable. These are the main advantages and disadvantages of each format: - -* **YAML**: simple, clean and readable, but not all IDEs support autocompletion - and validation for it. :ref:`Learn the YAML syntax `; -* **XML**: autocompleted/validated by most IDEs and is parsed natively by PHP, - but sometimes it generates configuration considered too verbose. `Learn the XML syntax`_; -* **PHP**: very powerful and it allows you to create dynamic configuration with - arrays or a :ref:`ConfigBuilder `. - ->>>>>>> 5.4 Importing Configuration Files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/contributing/code/pull_requests.rst b/contributing/code/pull_requests.rst index 289e6dbfa5a..fe8d9c5c1e0 100644 --- a/contributing/code/pull_requests.rst +++ b/contributing/code/pull_requests.rst @@ -505,11 +505,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/6.x`` or .. code-block:: terminal -<<<<<<< HEAD - $ git rebase -f upstream/6.1 -======= $ git rebase -f upstream/6.x ->>>>>>> 5.4 $ git push --force origin BRANCH_NAME .. note::