How to do a cherry-pick that includes multiple commits

Yes. Git lets you cherry-pick multiple commits in several ways.

### Cherry-pick specific commits

```bash
git cherry-pick <commit1> <commit2> <commit3>
```

Example:

```bash
git cherry-pick a1b2c3 d4e5f6 789abcd
```

Git applies them in the order you provide.

---

### Cherry-pick a range of commits

You can cherry-pick consecutive commits using a range:

```bash
git cherry-pick <start_commit>^..<end_commit>
```

Example:

```bash
git cherry-pick a1b2c3^..d4e5f6
```

That includes:

* `a1b2c3`
* everything after it
* up to `d4e5f6`

The `^` is important because ranges normally exclude the first commit.

---

### Cherry-pick without committing immediately

If you want to apply multiple commits and create a single combined commit:

```bash
git cherry-pick --no-commit <commit1> <commit2>
```

or

```bash
git cherry-pick -n <commit1> <commit2>
```

Then create one commit manually:

```bash
git commit -m "My combined changes"
```

---

### If conflicts happen

Git pauses and asks you to resolve them.

After fixing conflicts:

```bash
git add .
git cherry-pick --continue
```

To cancel the whole operation:

```bash
git cherry-pick --abort
```