Fix: Merge Conflicts

Author: RafaelJohn9

README.md

@@ -134,6 +134,7 @@ The site includes a test suite using [Playwright](https://playwright.dev/) to ve
     npm install @playwright/test
     ```
 
+<<<<<<< HEAD
 2. Install a browser (e.g., Firefox):
 
     ```console
@@ -223,6 +224,109 @@ ruby ./script/update-download-data.rb
     ruby ./script/update-book2.rb
     ```
 
+=======
+---
+
+### 2. Install a browser for Playwright tests (e.g., Firefox)
+
+Playwright supports several browsers including `firefox`, `chromium`, `webkit`, and `chrome`. You can install a specific browser like Firefox using:
+
+```console
+npx playwright install firefox
+```
+
+> **Note:**  
+> You can install all supported browsers with `npx playwright install`, but be aware that each browser download is over 100MB. To save space and time, install only the browsers you need.  
+> In GitHub Actions hosted runners, Chrome is pre-installed, and you might also be able to use your local Chrome installation.
+
+---
+
+### 3. Run tests against your local site
+
+By default, Playwright tests run against [https://git-scm.com/](https://git-scm.com/). To test your local changes, run a local server (e.g., on `http://localhost:5000/`) and then run the tests targeting it:
+
+```console
+PLAYWRIGHT_TEST_URL='http://localhost:5000/' npx playwright test --project=firefox
+```
+
+You can also run specific tests matching a pattern using `-g <regex>` for more fine-grained testing.
+
+---
+
+## Content Updates
+
+### Manual Pages
+
+1. Install Ruby prerequisites:
+
+    ```console
+    bundler install
+    ```
+
+2. Build manual pages from a local Git clone:
+
+    ```console
+    ruby ./script/update-docs.rb /path/to/git/.git en
+    ```
+
+   To build for a specific version:
+
+    ```console
+    version=v2.23.0
+    REBUILD_DOC=$version ruby ./script/update-docs.rb /path/to/git/.git en
+    ```
+
+   To build from GitHub (slower):
+
+    ```console
+    export GITHUB_API_TOKEN=github_personal_auth_token
+    REBUILD_DOC=$version ruby ./script/update-docs.rb remote en
+    ```
+
+   For localized man pages, use a local clone of [git-html-l10n](https://github.com/jnavila/git-html-l10n):
+
+    ```console
+    ruby ./script/update-docs.rb /path/to/git-html-l10n/.git l10n
+    REBUILD_DOC=$version ruby ./script/update-docs.rb /path/to/git-html-l10n/.git l10n
+    ```
+
+### Downloads Data
+
+Update the downloads data for the site:
+
+```console
+ruby ./script/update-download-data.rb
+```
+
+### ProGit Book
+
+1. Install prerequisites:
+
+    ```console
+    bundler install
+    ```
+
+2. Clone the book repository and update:
+
+    ```console
+    git clone https://github.com/progit/progit2-fr ../progit2-fr
+    ruby ./script/update-book2.rb fr ../progit2-fr
+    ```
+
+   Alternatively, fetch from GitHub:
+
+    ```console
+    export GITHUB_API_TOKEN=github_personal_auth_token
+    ruby ./script/update-book2.rb en
+    ```
+
+   To build for all languages:
+
+    ```console
+    ruby ./script/update-book2.rb
+    ```
+
+>>>>>>> temp-branch
 ---
 
 ## Contributing