Remove directions to ignore config file changes

During a Lineage merge any changes should be manually resolved to ensure that
all relevant changes are being applied. The current directions may lead someone
to blindly ignore changes in the Lineage configuration file. Since this file is
rarely changed it should always be manually reviewed if it's a file with
conflicts.

src/lineage/entrypoint.py

@@ -357,19 +357,10 @@ def main() -> None:
                 continue
             # If we can successfully push, continue with generating a PR
             if push(repo, pr_branch_name, "git", access_token):
-                # Display instructions for ignoring incoming Lineage config changes
-                display_lineage_config_skip: bool = (
-                    CONFIG_FILENAME in conflict_file_list
-                )
-                if display_lineage_config_skip:
-                    # This will no longer be a conflict, we tell user how to ignore.
-                    conflict_file_list.remove(CONFIG_FILENAME)
                 if branch_is_new:
                     logging.info("Creating a new pull request since branch is new.")
                     template_data = {
                         "conflict_file_list": conflict_file_list,
-                        "display_lineage_config_skip": display_lineage_config_skip,
-                        "lineage_config_filename": CONFIG_FILENAME,
                         "lineage_id": lineage_id,
                         "local_branch": local_branch,
                         "metadata": PR_METADATA,

src/lineage/templates/conflict_template.md

@@ -27,9 +27,7 @@ that you must resolve before merging this pull request!
     git remote set-url --push {{ lineage_id }} no_push
     git switch {{ local_branch }}
     git checkout -b {{ pr_branch_name }} --track origin/{{ local_branch }}
-    git pull {{ lineage_id }} {{ remote_branch }}{{#display_lineage_config_skip}}
-    git checkout --ours -- {{lineage_config_filename}}
-    git add {{lineage_config_filename}}{{/display_lineage_config_skip}}
+    git pull {{ lineage_id }} {{ remote_branch }}
     git status
     ```