About

In Git, the merge mechanisms are:

• The high level command: git merge and git pull
• The low-level command: git cherry-pick

Strategy

They allow the backend merge strategies ¹⁾ to be chosen (with the -s option)