Merge, rebase, or cherry-pick to apply changes | IntelliJ IDEA