Skip to main content

​
Cherry-pick

Applies a commit’s changes as a new commit on top of the current branch. For a single commit, right-click → Cherry-pick commit; for several, multi-select them and click Cherry-pick N commits, which applies them in order from oldest to newest.
If the selection includes a merge commit, the item changes to Cherry-pick N commits (merge commit in selection) and becomes disabled. If a conflict occurs, the sequence stops; clicking Continue in the Working copy panel applies the remaining commits, and clicking Abort cancels the whole thing.

​
Revert

Right-click a commit and choose Revert commit to create a new commit that undoes its changes. The existing history is preserved. When you revert a merge commit, a dialog opens for choosing the Mainline parent (the default is Parent 1). It keeps the branch of the parent you chose and reverts the changes on the other side.
Choosing the wrong mainline keeps the changes on the other side. Check which parent was the base branch at the time of the merge.