Merge remote-tracking branch 'upstream/Main' into fix-for-issue-10569

* upstream/Main:
  openrerwrite
  Update .github/PULL_REQUEST_TEMPLATE.md
  Update PULL_REQUEST_TEMPLATE.md
  Update .github/PULL_REQUEST_TEMPLATE.md
  Update PULL_REQUEST_TEMPLATE.md
  Replace "fixes" by "resolves"
  Change JavaDoc to annotation (JabRef#10571)
  Fix link (JabRef#10575)
  Enable collecting GitHub build artifacts for forks (JabRef#10574)
  Fix file field merging (JabRef#10573)
  Update .gitignore

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,18 @@
 <!-- 
 Describe the changes you have made here: what, why, ... 
-Link issues that are fixed, e.g. "Fixes #333".
-If you fixed a koppor issue, link it, e.g. "Fixes https://github.com/koppor/jabref/issues/47".
-The title of the PR must not reference an issue, because GitHub does not support autolinking there.
+Link the issue that will be closed, e.g., "Closes #333".
+If your PR closes a koppor issue, link it using its URL, e.g., "Closes https://github.com/koppor/jabref/issues/47".
+"Closes" is a keyword GitHub uses to link PRs with issues; do not change it.
+Don't reference an issue in the PR title because GitHub does not support auto-linking there.
 -->
 
+### Mandatory checks
 
 <!-- 
 - Go through the list below. Please don't remove any items.
 - [x] done; [ ] not done / not applicable
 -->
 
-### Mandatory checks
-
 - [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable)
 - [ ] Tests created for changes (if applicable)
 - [ ] Manually tested changed features in running JabRef (always required)

.github/workflows/deployment.yml

@@ -224,6 +224,13 @@ jobs:
  # tbn = to-be-notarized
  name: JabRef-macOS-tbn
  path: build/distribution
+ - name: Upload to GitHub workflow artifacts store
+ if: (steps.checksecrets.outputs.secretspresent != 'YES')
+ uses: actions/upload-artifact@v3
+ with:
+ # tbn = to-be-notarized
+ name: JabRef-${{ matrix.os }}
+ path: build/distribution
  announce:
  name: Comment on pull request
  runs-on: ubuntu-latest
@@ -242,7 +249,7 @@ jobs:
  env:
  BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
  - name: Comment PR
- if: steps.checksecrets.outputs.secretspresent == 'YES'
+ if: (steps.checksecrets.outputs.secretspresent == 'YES')
  uses: thollander/actions-comment-pull-request@v2
  with:
  message: |