yet another attempt at avoiding merge conflict

Author: truib

scripts/automated_ingestion/eessi_task.py

@@ -832,7 +832,7 @@ def _find_pr_for_branch(self, branch_name: str) -> Optional[PullRequest]:
         """
         try:
             head_ref = f"{self.git_repo.owner.login}:{branch_name}"
-            filter_prs = [16, 17, 18, 19, 20]  # TODO: remove this once the PR is merged
+            filter_prs = [16, 17, 18, 19, 20, 21]  # TODO: remove this once the PR is merged
             prs = [pr for pr in list(self.git_repo.get_pulls(state='all', head=head_ref))
                    if pr.number not in filter_prs]
             return prs[0] if prs else None
@@ -926,8 +926,13 @@ def _handle_add_payload_staged(self):
             # - next state in default branch (interpreted as current state)
             # - approved state in feature branch (interpreted as future state, ie, after the PR is merged)
             self._update_task_state_file(next_state, branch_name=default_branch_name)
-            # sync task state file from default to feature branch (attempt to avoid merge conflicts)
-            self._sync_task_state_file(default_branch_name, feature_branch_name)
+            # merge default branch into feature branch (attempt to avoid merge conflicts)
+            self.git_repo.merge(
+                head=default_branch_name,
+                base=feature_branch_name,
+                commit_message=f"Merge {default_branch_name} into {feature_branch_name}"
+            )
+            # update task state file in feature branch
             self._update_task_state_file(approved_state, branch_name=feature_branch_name)
             log_message(LoggingScope.TASK_OPS, 'INFO',
                         "TaskState file updated to %s in default branch (%s) and to %s in feature branch (%s)",