feat(patch): merge patch

[JChrist]

Add button when viewing a patch to merge it to the patch's target (for now always the repo's default branch

The steps performed to merge a patch are:

• Identify if the working tree is clean. If not, stash changes via git stash
• Identify if current branch is the repo's default branch. If not, checkout the default branch.
• Ask the user about merge options, such as fast-forward-only, always-create-merge-commit, squash, etc
• Perform the git merge, enabling the merge conflict resolution mechanism if needed.
• Checkout back to previous branch (if not already there and not tracking remote patch)
• Pop changes from stash (if working tree was not clean).

Closes #369

[github-actions[bot]]

Qodana Community for JVM

230 new problems were found

Inspection name	Severity	Problems
Unstable API Usage	🔶 Warning	225
Result of method call ignored	🔶 Warning	2
Field can be local	🔶 Warning	1
@NotNull/@Nullable problems	🔶 Warning	1
Method can be extracted	◽️ Notice	1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked

View the detailed Qodana report

To be able to view the detailed Qodana report, you can either: 1. Register at [Qodana Cloud](https://qodana.cloud/) and [configure the action](https://github.com/jetbrains/qodana-action#qodana-cloud) 2. Use [GitHub Code Scanning with Qodana](https://github.com/jetbrains/qodana-action#github-code-scanning) 3. Host [Qodana report at GitHub Pages](https://github.com/JetBrains/qodana-action/blob/3a8e25f5caad8d8b01c1435f1ef7b19fe8b039a0/README.md#github-pages) 4. Inspect and use `qodana.sarif.json` (see [the Qodana SARIF format](https://www.jetbrains.com/help/qodana/qodana-sarif-output.html#Report+structure) for details) To get `*.log` files or any other Qodana artifacts, run the action with `upload-result` option set to `true`, so that the action will upload the files as the job artifacts: ```yaml - name: 'Qodana Scan' uses: JetBrains/qodana-action@v2023.2.9 with: upload-result: true ```

Contact Qodana team

Contact us at [qodana-support@jetbrains.com](mailto:qodana-support@jetbrains.com) - Or via our issue tracker: https://jb.gg/qodana-issue - Or share your feedback: https://jb.gg/qodana-discussions