How to merge changes from a branch to trunk/master?

Question

How can changes be merged from a feature branch into the trunk (main/master branch)?

Answer

To merge changes from a branch to the trunk in IntelliJ IDEA:

1. Navigate to Git Branches in the IDE.
2. Checkout the branch you wish to merge into (e.g., main or trunk).
3. Select Merge 'branch name' into main... for the branch containing the changes.
4. Resolve any merge conflicts within the Git Merge Dialog by choosing the changes to be retained or editing the files directly.
5. Once conflicts are resolved, commit the merged changes.

For detailed and step-by-step instructions, visit the JetBrains Guide on resolving Git merge conflicts.