Advanced Install Guide: Merge conflicts all the way down.

Unable to install forge using the Advanced installation guide. (Install over Automatic) Another user posted this issue on https://github.com/continue-revolution/sd-webui-animatediff/issues/549, but I think the issue may be on this side instead.

I:\Stable Diffusion>git pull
error: Your local changes to the following files would be overwritten by merge:
        webui-user.bat
Please commit your changes or stash them before you merge.
Aborting
Merge with strategy ort failed.

I:\Stable Diffusion>git stash
Saved working directory and index state WIP on lllyasviel/main: 82a973c0 changelog

I:\Stable Diffusion>git pull
CONFLICT (modify/delete): .github/ISSUE_TEMPLATE/bug_report.yml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of .github/ISSUE_TEMPLATE/bug_report.yml left in tree.
CONFLICT (modify/delete): .github/workflows/on_pull_request.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of .github/workflows/on_pull_request.yaml left in tree.
CONFLICT (modify/delete): .github/workflows/run_tests.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of .github/workflows/run_tests.yaml left in tree.
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
CONFLICT (modify/delete): configs/alt-diffusion-inference.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/alt-diffusion-inference.yaml left in tree.
CONFLICT (modify/delete): configs/alt-diffusion-m18-inference.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/alt-diffusion-m18-inference.yaml left in tree.
CONFLICT (modify/delete): configs/instruct-pix2pix.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/instruct-pix2pix.yaml left in tree.
CONFLICT (modify/delete): configs/sd_xl_inpaint.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/sd_xl_inpaint.yaml left in tree.
CONFLICT (modify/delete): configs/v1-inference.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/v1-inference.yaml left in tree.
CONFLICT (modify/delete): configs/v1-inpainting-inference.yaml deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of configs/v1-inpainting-inference.yaml left in tree.
CONFLICT (modify/delete): extensions-builtin/LDSR/sd_hijack_ddpm_v1.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of extensions-builtin/LDSR/sd_hijack_ddpm_v1.py left in tree.
CONFLICT (modify/delete): extensions-builtin/Lora/networks.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of extensions-builtin/Lora/networks.py left in tree.
CONFLICT (modify/delete): extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js left in tree.
CONFLICT (modify/delete): extensions-builtin/canvas-zoom-and-pan/scripts/hotkey_config.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of extensions-builtin/canvas-zoom-and-pan/scripts/hotkey_config.py left in tree.
CONFLICT (modify/delete): extensions-builtin/hypertile/scripts/hypertile_script.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of extensions-builtin/hypertile/scripts/hypertile_script.py left in tree.
CONFLICT (rename/delete): scripts/processing_autosized_crop.py renamed to extensions-builtin/postprocessing-for-training/scripts/postprocessing_autosized_crop.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
CONFLICT (rename/delete): scripts/postprocessing_caption.py renamed to extensions-builtin/postprocessing-for-training/scripts/postprocessing_caption.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
CONFLICT (rename/delete): scripts/postprocessing_create_flipped_copies.py renamed to extensions-builtin/postprocessing-for-training/scripts/postprocessing_create_flipped_copies.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
CONFLICT (rename/delete): scripts/postprocessing_focal_crop.py renamed to extensions-builtin/postprocessing-for-training/scripts/postprocessing_focal_crop.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
CONFLICT (rename/delete): scripts/postprocessing_split_oversized.py renamed to extensions-builtin/postprocessing-for-training/scripts/postprocessing_split_oversized.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
Auto-merging extensions-builtin/sd_forge_lora/extra_networks_lora.py
CONFLICT (content): Merge conflict in extensions-builtin/sd_forge_lora/extra_networks_lora.py
Auto-merging extensions-builtin/sd_forge_lora/scripts/lora_script.py
CONFLICT (content): Merge conflict in extensions-builtin/sd_forge_lora/scripts/lora_script.py
Auto-merging extensions-builtin/sd_forge_lora/ui_edit_user_metadata.py
CONFLICT (content): Merge conflict in extensions-builtin/sd_forge_lora/ui_edit_user_metadata.py
Auto-merging extensions-builtin/sd_forge_lora/ui_extra_networks_lora.py
CONFLICT (content): Merge conflict in extensions-builtin/sd_forge_lora/ui_extra_networks_lora.py
Auto-merging extensions-builtin/soft-inpainting/scripts/soft_inpainting.py
Auto-merging html/extra-networks-pane-dirs.html
CONFLICT (add/add): Merge conflict in html/extra-networks-pane-dirs.html
Auto-merging html/extra-networks-pane-tree.html
CONFLICT (add/add): Merge conflict in html/extra-networks-pane-tree.html
Auto-merging javascript/aspectRatioOverlay.js
CONFLICT (content): Merge conflict in javascript/aspectRatioOverlay.js
Auto-merging javascript/imageviewer.js
Auto-merging javascript/ui.js
Auto-merging modules/api/api.py
CONFLICT (content): Merge conflict in modules/api/api.py
Auto-merging modules/api/models.py
Auto-merging modules/call_queue.py
CONFLICT (content): Merge conflict in modules/call_queue.py
Auto-merging modules/cmd_args.py
CONFLICT (content): Merge conflict in modules/cmd_args.py
Auto-merging modules/deepbooru.py
CONFLICT (content): Merge conflict in modules/deepbooru.py
Auto-merging modules/devices.py
CONFLICT (content): Merge conflict in modules/devices.py
Auto-merging modules/extensions.py
Auto-merging modules/hypernetworks/hypernetwork.py
CONFLICT (content): Merge conflict in modules/hypernetworks/hypernetwork.py
Auto-merging modules/images.py
CONFLICT (content): Merge conflict in modules/images.py
Auto-merging modules/img2img.py
CONFLICT (content): Merge conflict in modules/img2img.py
Auto-merging modules/infotext_utils.py
CONFLICT (content): Merge conflict in modules/infotext_utils.py
Auto-merging modules/initialize.py
CONFLICT (content): Merge conflict in modules/initialize.py
Auto-merging modules/initialize_util.py
Auto-merging modules/launch_utils.py
Auto-merging modules/lowvram.py
CONFLICT (content): Merge conflict in modules/lowvram.py
Auto-merging modules/mac_specific.py
CONFLICT (content): Merge conflict in modules/mac_specific.py
Auto-merging modules/models/diffusion/ddpm_edit.py
CONFLICT (content): Merge conflict in modules/models/diffusion/ddpm_edit.py
Auto-merging modules/models/sd3/sd3_cond.py
CONFLICT (add/add): Merge conflict in modules/models/sd3/sd3_cond.py
Auto-merging modules/models/sd3/sd3_model.py
CONFLICT (add/add): Merge conflict in modules/models/sd3/sd3_model.py
Auto-merging modules/postprocessing.py
Auto-merging modules/processing.py
CONFLICT (content): Merge conflict in modules/processing.py
Auto-merging modules/processing_scripts/sampler.py
CONFLICT (add/add): Merge conflict in modules/processing_scripts/sampler.py
Auto-merging modules/profiling.py
CONFLICT (add/add): Merge conflict in modules/profiling.py
Auto-merging modules/prompt_parser.py
Auto-merging modules/rng.py
Auto-merging modules/safe.py
Auto-merging modules/scripts.py
CONFLICT (content): Merge conflict in modules/scripts.py
Auto-merging modules/sd_hijack.py
CONFLICT (content): Merge conflict in modules/sd_hijack.py
Auto-merging modules/sd_hijack_clip.py
CONFLICT (content): Merge conflict in modules/sd_hijack_clip.py
Auto-merging modules/sd_hijack_optimizations.py
CONFLICT (content): Merge conflict in modules/sd_hijack_optimizations.py
Auto-merging modules/sd_hijack_unet.py
CONFLICT (content): Merge conflict in modules/sd_hijack_unet.py
Auto-merging modules/sd_models.py
CONFLICT (content): Merge conflict in modules/sd_models.py
Auto-merging modules/sd_models_config.py
CONFLICT (content): Merge conflict in modules/sd_models_config.py
Auto-merging modules/sd_models_types.py
CONFLICT (content): Merge conflict in modules/sd_models_types.py
Auto-merging modules/sd_models_xl.py
CONFLICT (content): Merge conflict in modules/sd_models_xl.py
Auto-merging modules/sd_samplers.py
CONFLICT (content): Merge conflict in modules/sd_samplers.py
Auto-merging modules/sd_samplers_cfg_denoiser.py
CONFLICT (content): Merge conflict in modules/sd_samplers_cfg_denoiser.py
Auto-merging modules/sd_samplers_common.py
CONFLICT (content): Merge conflict in modules/sd_samplers_common.py
Auto-merging modules/sd_samplers_kdiffusion.py
CONFLICT (content): Merge conflict in modules/sd_samplers_kdiffusion.py
Auto-merging modules/sd_samplers_timesteps.py
Auto-merging modules/sd_schedulers.py
CONFLICT (add/add): Merge conflict in modules/sd_schedulers.py
Auto-merging modules/sd_vae_approx.py
CONFLICT (content): Merge conflict in modules/sd_vae_approx.py
Auto-merging modules/sd_vae_taesd.py
CONFLICT (content): Merge conflict in modules/sd_vae_taesd.py
Auto-merging modules/shared.py
CONFLICT (content): Merge conflict in modules/shared.py
Auto-merging modules/shared_init.py
CONFLICT (content): Merge conflict in modules/shared_init.py
Auto-merging modules/shared_items.py
Auto-merging modules/shared_options.py
CONFLICT (content): Merge conflict in modules/shared_options.py
Auto-merging modules/shared_state.py
CONFLICT (content): Merge conflict in modules/shared_state.py
CONFLICT (modify/delete): modules/textual_inversion/autocrop.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of modules/textual_inversion/autocrop.py left in tree.
CONFLICT (modify/delete): modules/textual_inversion/dataset.py deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of modules/textual_inversion/dataset.py left in tree.
CONFLICT (rename/delete): modules/textual_inversion/logging.py renamed to modules/textual_inversion/saving_settings.py in HEAD, but deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9.
Auto-merging modules/textual_inversion/textual_inversion.py
CONFLICT (content): Merge conflict in modules/textual_inversion/textual_inversion.py
Auto-merging modules/txt2img.py
CONFLICT (content): Merge conflict in modules/txt2img.py
Auto-merging modules/ui.py
CONFLICT (content): Merge conflict in modules/ui.py
Auto-merging modules/ui_common.py
CONFLICT (content): Merge conflict in modules/ui_common.py
Auto-merging modules/ui_components.py
Auto-merging modules/ui_extensions.py
Auto-merging modules/ui_extra_networks.py
Auto-merging modules/ui_loadsave.py
Auto-merging modules/ui_postprocessing.py
CONFLICT (content): Merge conflict in modules/ui_postprocessing.py
Auto-merging modules/ui_settings.py
Auto-merging packages_3rdparty/webui_lora_collection/lyco_helpers.py
CONFLICT (content): Merge conflict in packages_3rdparty/webui_lora_collection/lyco_helpers.py
Auto-merging packages_3rdparty/webui_lora_collection/network.py
CONFLICT (content): Merge conflict in packages_3rdparty/webui_lora_collection/network.py
Auto-merging packages_3rdparty/webui_lora_collection/network_lora.py
CONFLICT (content): Merge conflict in packages_3rdparty/webui_lora_collection/network_lora.py
Auto-merging pyproject.toml
CONFLICT (modify/delete): requirements.txt deleted in e5f213c21e02fd90c56a0c5e8e776ee4a20c18d9 and modified in HEAD.  Version HEAD of requirements.txt left in tree.
Auto-merging requirements_versions.txt
CONFLICT (content): Merge conflict in requirements_versions.txt
Auto-merging style.css
CONFLICT (content): Merge conflict in style.css
Automatic merge failed; fix conflicts and then commit the result.

Start with the Advanced installation guide and reproduce its install-over-Automatic update path using the reported git pull and git stash sequence. Review the listed merge conflicts, including webui-user.bat, .gitignore, README.md, and the modules and extensions files, then establish an update procedure that completes without repository conflicts.