cherry-pick strategy

Learn to choose a merge strategy.

Cherry-pick Merge Strategy

During cherry-pick, Git uses its merge mechanism to apply commit changes to the current branch. You can specify a merge strategy with the -s option. Choosing a strategy becomes important when you want to control how changes from different histories are merged.

git cherry-pick -s ort

Use the ort Strategy

ort is a merge strategy used in modern versions of Git. You can explicitly specify this strategy by writing -s ort in the cherry-pick command. Git then merges the selected commit's changes with the current branch using the ort strategy.

git cherry-pick -s ort abc1234

Exercise Create a Cherry-Pick Strategy Command

Assign a command to commandText that applies commit abc1234 using the ort strategy. Then print the command.

Show example solution

let commandText = "git cherry-pick -s ort abc1234";
console.log(commandText);

Test yourself

Which option specifies a merge strategy during cherry-pick?
- -m
- -s
- -n
- -x
Show answer

-s — <code>-s</code> lets you select a merge strategy for the cherry-pick operation.

Specify the Strategy

git cherry-pick -s ort____

Show answer

git cherry-pick -s ortort

Strategy Options

-s

Strategy option
ort

Modern merge strategy
recursive

Older merge strategy
abc1234

Commit identifier to apply

Next lesson: Summary - Advanced cherry-pick

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies