Update pull_upstream.yml

Author: kostrykin

.github/workflows/pull_upstream.yml

@@ -44,6 +44,12 @@ jobs:
         run: |
           git merge upstream/master --allow-unrelated-histories --squash
 
+      - name: List files with merge conflicts
+        shell: bash
+        run: |
+          echo "Please resolve merge conflicts within the following files:\n" >> .pr-body.md
+          git diff --name-only --diff-filter=U --relative | awk '{print "- " $0}' >> .pr-body.md
+
       - name: Commit
         id: commit
         continue-on-error: true
@@ -61,6 +67,6 @@ jobs:
         if: steps.commit.outcome == 'success'
         shell: bash
         run: |
-          gh pr create --fill --base ${{ github.ref_name }} --head pull_upstream
+          gh pr create --fill --body-file ".pr-body.md" --base ${{ github.ref_name }} --head pull_upstream
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}